Skip to content

Commit

Permalink
Added support for macos-14
Browse files Browse the repository at this point in the history
  • Loading branch information
ankane committed Feb 1, 2024
1 parent d327d50 commit 0e1cda8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 20 deletions.
21 changes: 3 additions & 18 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,8 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04, ubuntu-20.04, macos-13, macos-12, macos-11]
postgres-version: [16, 15, 14, 13, 12, 11]
include:
- os: ubuntu-22.04
postgres-version: 10
- os: ubuntu-20.04
postgres-version: 10
- os: ubuntu-22.04
postgres-version: 9.6
- os: ubuntu-20.04
postgres-version: 9.6
- os: windows-2022
postgres-version: 14
- os: windows-2019
postgres-version: 14
os: [macos-14]
postgres-version: [16, 15, 14, 13, 12]
steps:
- uses: actions/checkout@v4
- uses: ./.
Expand All @@ -35,6 +22,4 @@ jobs:
- run: psql -d testdb -h localhost -c 'SHOW server_version'
- run: psql --version
- run: pg_config
# Homebrew has invalid path for Postgres 12 and 13
- if: ${{ matrix.postgres-version == 11 }}
run: test -f $(pg_config --includedir-server)/postgres.h
- run: test -f $(pg_config --includedir-server)/postgres.h
4 changes: 2 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ if (isMac()) {
bin = `/usr/local/opt/postgresql@${postgresVersion}/bin`;
let dataDir = `/usr/local/var/postgresql@${postgresVersion}`;

if (postgresVersion != 14 || process.env['ImageOS'] == 'macos13') {
if (process.env['ImageOS'] != 'macos13') {
if (postgresVersion != 14 || process.env['ImageOS'] == 'macos13' || process.env['ImageOS'] == 'macos14') {
if (process.env['ImageOS'] != 'macos13' && process.env['ImageOS'] != 'macos14') {
// remove previous version
run(`brew unlink postgresql@14`);
}
Expand Down

0 comments on commit 0e1cda8

Please sign in to comment.