workaround macos-23 libpq not found

vaintroub · Sep 9, 2023 · fbf3a2d · fbf3a2d
1 parent 3a896cd
commit fbf3a2d
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/.github/workflows/cmake-single-os.yml b/.github/workflows/cmake-single-os.yml
@@ -31,6 +31,7 @@ jobs:
  run : |
  HOMEBREW_NO_AUTO_UPDATE=1 brew install mysql-client libpq ninja
  brew link --force mysql-client
+ brew link --force --overwrite libpq
 
  - name: install build prerequisites (Windows)
  if: runner.os == 'Windows'
@@ -50,6 +51,18 @@ jobs:
  - name: build package
  run: cmake --build . --config Release --target package -j
 
+ - name: test_install
+ run: |
+ cmake --install . --config Release --prefix install_dir
+
+ - name: Archive build
+ uses: actions/upload-artifact@v3
+ with:
+ name: build-${{ inputs.os }}
+ retention-days: 1
+ path: |
+ install_dir
+
  - name: setup mysql for unit tests
  if: runner.os != 'Windows'
  uses: shogo82148/actions-setup-mysql@v1
@@ -72,17 +85,6 @@ jobs:
  name: ${{ inputs.os }}-package
  path: ./*.zip
 
- - name: test_install
- run: |
- cmake --install . --config Release --prefix install_dir
-
- - name: Archive build
- uses: actions/upload-artifact@v3
- with:
- name: build-${{ inputs.os }}
- retention-days: 1
- path: |
- install_dir
 
  # Tests Ninja generator, non-standard compiler (clang on Linux and gcc on Windows and macOS)
  build-ninja:
@@ -97,6 +99,7 @@ jobs:
  run : |
  HOMEBREW_NO_AUTO_UPDATE=1 brew install ninja mysql-client libpq
  brew link --force mysql-client
+ brew link --force --overwrite libpq
 
  - name: install ninja (Linux)
  if: runner.os == 'Linux'
@@ -209,6 +212,7 @@ jobs:
  run : |
  HOMEBREW_NO_AUTO_UPDATE=1 brew install mysql-client libpq
  brew link --force mysql-client
+ brew link --force --overwrite libpq
 
  - name: update environment (Windows)
  if: runner.os == 'Windows'