]> git.ipfire.org Git - thirdparty/psycopg.git/commitdiff
ci: bump runner to macOS 13 973/head
authorDaniele Varrazzo <daniele.varrazzo@gmail.com>
Fri, 20 Dec 2024 13:57:37 +0000 (14:57 +0100)
committerDaniele Varrazzo <daniele.varrazzo@gmail.com>
Fri, 20 Dec 2024 18:04:49 +0000 (19:04 +0100)
macOS 12 runners are now deprecated.

.github/workflows/packages-bin.yml
.github/workflows/tests.yml

index 46cd56ee3562b5d784c67c50a6c1414f97b1f1a2..3c81ac64b138a0028ac5cf3573cdccddb049adfc 100644 (file)
@@ -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
index d19ae7e5bef378f86f31dfc4b3b0877029513395..7735bf7797d8e4438452a121fdb5c0a591a437e3 100644 (file)
@@ -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