From: Daniele Varrazzo Date: Fri, 20 Dec 2024 13:57:37 +0000 (+0100) Subject: ci: bump runner to macOS 13 X-Git-Tag: 3.2.4~17 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F973%2Fhead;p=thirdparty%2Fpsycopg.git ci: bump runner to macOS 13 macOS 12 runners are now deprecated. --- diff --git a/.github/workflows/packages-bin.yml b/.github/workflows/packages-bin.yml index 46cd56ee3..3c81ac64b 100644 --- a/.github/workflows/packages-bin.yml +++ b/.github/workflows/packages-bin.yml @@ -152,8 +152,8 @@ jobs: # }}} - macos-12: # {{{ - runs-on: macos-12 + macos-13: # {{{ + runs-on: macos-13 if: true strategy: @@ -191,7 +191,7 @@ jobs: CIBW_TEST_COMMAND: >- pytest {project}/tests -m 'not slow and not flakey' --color yes CIBW_ENVIRONMENT: >- - MACOSX_DEPLOYMENT_TARGET=12.0 + MACOSX_DEPLOYMENT_TARGET=13.0 PSYCOPG_IMPL=binary PSYCOPG_TEST_DSN='dbname=postgres' PATH="/usr/local/opt/postgresql@${PG_VERSION}/bin:$PATH" @@ -200,7 +200,7 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: macos-12-${{matrix.pyver}}-macosx_${{matrix.arch}} + name: macos-13-${{matrix.pyver}}-macosx_${{matrix.arch}} path: ./wheelhouse/*.whl @@ -263,7 +263,7 @@ jobs: needs: - linux - macos-14 - - macos-12 + - macos-13 - windows steps: - name: Merge Artifacts diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d19ae7e5b..7735bf779 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -212,8 +212,8 @@ jobs: # }}} - macos-12: # {{{ - runs-on: macos-12 + macos-13: # {{{ + runs-on: macos-13 if: true strategy: @@ -252,10 +252,17 @@ jobs: - name: Start PostgreSQL service run: brew services start postgresql@${PG_VERSION} + - name: Find the libpq + if: ${{ matrix.impl == 'python' }} + run: | + echo "DYLD_LIBRARY_PATH=/usr/local/opt/postgresql@${PG_VERSION}/lib/postgresql:$DYLD_LIBRARY_PATH" \ + >> $GITHUB_ENV + - name: Include psycopg-c to the packages to install if: ${{ matrix.impl == 'c' }} run: | echo "DEPS=$DEPS ./psycopg_c" >> $GITHUB_ENV + echo "PATH=/usr/local/opt/postgresql@${PG_VERSION}/bin:$PATH" >> $GITHUB_ENV - name: Install Python packages run: pip install $DEPS