Skip to content

Commit

Permalink
Update macos version in CI up to 14 (#297)
Browse files Browse the repository at this point in the history
* Update macos version in CI up to 15

* Install libicu4c dependency

* Revert "Install libicu4c dependency"

This reverts commit a5b67f3.

* Fix homebrew location

* Try macos 14

* Limit number of parallel jobs in make
  • Loading branch information
artemgavrilov authored Oct 2, 2024
1 parent f4c065e commit e3018fc
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/postgresql-16-src-make-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [pull_request, workflow_dispatch]
jobs:
build:
name: pg-16-src-make-test
runs-on: macos-12
runs-on: macos-14
steps:
- name: Install dependencies
run: |
Expand All @@ -28,18 +28,18 @@ jobs:

- name: Build postgres
run: |
export LDFLAGS="-L/usr/local/opt/openssl/lib"
export CPPFLAGS="-I/usr/local/opt/openssl/include"
export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig"
export LDFLAGS="-L/opt/homebrew/opt/openssl/lib"
export CPPFLAGS="-I/opt/homebrew/opt/openssl/include"
export PKG_CONFIG_PATH="/opt/homebrew/opt/icu4c/lib/pkgconfig"
./configure --with-openssl --enable-tap-tests=no --prefix=$HOME/postgres
make -j
make -j 4
sudo make install
working-directory: src

- name: Build pg_tde
run: |
./configure
make -j MAJORVERSION=16
make -j 4 MAJORVERSION=16
sudo make install
working-directory: src/contrib/pg_tde

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/postgresql-16-src-meson-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [pull_request, workflow_dispatch]
jobs:
build:
name: pg-16-src-meson-test
runs-on: macos-12
runs-on: macos-14
steps:
- name: Install dependencies
run: |
Expand All @@ -29,7 +29,7 @@ jobs:
- name: Build postgres
run: |
export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig"
export PKG_CONFIG_PATH="/opt/homebrew/opt/icu4c/lib/pkgconfig"
meson setup build --prefix `pwd`/../inst --buildtype=debug -Dcassert=true
cd build && ninja && ninja install
working-directory: src
Expand Down

0 comments on commit e3018fc

Please sign in to comment.