From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Tue, 26 Aug 2025 11:22:12 +0000 (+0200)
Subject: ci: use separate build caches between psycopg 3.2 and 3.3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b28b794927ec42f97121f917bb7eb3b0b076a35;p=thirdparty%2Fpsycopg.git

ci: use separate build caches between psycopg 3.2 and 3.3

Introduce a suffix to change the cache key arbitrarily, to keep libpq
builds on different branches separate and not pollute each other's
cache.
---

diff --git a/.github/workflows/packages-bin.yml b/.github/workflows/packages-bin.yml
index 3e2cfdf6f..4b6fd24e8 100644
--- a/.github/workflows/packages-bin.yml
+++ b/.github/workflows/packages-bin.yml
@@ -35,6 +35,13 @@ env:
   # Latest release: https://www.openssl.org/source/
   OPENSSL_VERSION: "3.5.0"
 
+  # A string to differentiate build cacke keys to allow building different
+  # flavours of libpq in different branches without mixups. Currently used to
+  # make sure that libpq packages built for Psycopg 3.2 and 3.3 don't mix (in
+  # order to change the gssencmode default only on 3.3). We may use it for
+  # different reasons in the future.
+  PQ_FLAGS: "-gssencmode-disable"
+
 concurrency:
   # Cancel older requests of the same workflow in the same branch.
   group: ${{ github.workflow }}-${{ github.ref_name }}
@@ -67,7 +74,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: /tmp/libpq.build
-          key: libpq-${{ matrix.platform }}-${{ matrix.arch }}-${{ env.LIBPQ_VERSION }}-${{ env.OPENSSL_VERSION }}
+          key: libpq-${{ matrix.platform }}-${{ matrix.arch }}-${{ env.LIBPQ_VERSION }}-${{ env.OPENSSL_VERSION }}${{ env.PQ_FLAGS }}
 
       - name: Create the binary package source tree
         run: python3 ./tools/ci/copy_to_binary.py
@@ -140,7 +147,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: /tmp/libpq.build
-          key: libpq-${{ env.LIBPQ_VERSION }}-macos-${{ matrix.arch }}-${{ env.OPENSSL_VERSION }}
+          key: libpq-${{ env.LIBPQ_VERSION }}-macos-${{ matrix.arch }}-${{ env.OPENSSL_VERSION }}${{ env.PQ_FLAGS }}
 
       - name: Create the binary package source tree
         run: python3 ./tools/ci/copy_to_binary.py