fix?

timescale · Nov 8, 2023 · afcbcd9 · afcbcd9
1 parent 46d96a7
commit afcbcd9
Showing 1 changed file with 6 additions and 23 deletions.
diff --git a/.github/workflows/abi.yaml b/.github/workflows/abi.yaml
@@ -90,24 +90,15 @@ jobs:
       run: |
         BUILDER_IMAGE="postgres:${{matrix.builder}}-alpine"
 
-        # Recent versions of alpine have OpenSSL 3 as the
-        # default version which is unfortunately not packaged
-        # for the earliest versions we check against in this
-        # test. So we pin the version we compile against to
-        # OpenSSL 1.1 in the backwards test.
-        # if [[ "${{ matrix.test }}" == *backward ]]; then
-        #   EXTRA_PKGS="openssl1.1-compat-dev"
-        # else
-        #   EXTRA_PKGS="openssl-dev"
-        # fi
-        # EXTRA_PKGS="openssl1.1-compat-dev"
-
         docker pull ${BUILDER_IMAGE}
         docker buildx imagetools inspect ${BUILDER_IMAGE}
         docker run -i --rm -v $(pwd):/mnt -e EXTRA_PKGS="${EXTRA_PKGS}" ${BUILDER_IMAGE} bash <<"EOF"
           apk add cmake gcc make build-base krb5-dev git ${EXTRA_PKGS}
-          apk add openssl1.1-compat-dev
-          apk add openssl-dev
+          # We run the same extension on different docker images, old versions
+          # have OpenSSL 1.1 and the new versions have OpenSSL 3, so we try to
+          # pin the 1.1. Note that depending on PG version, both images might
+          # have 1.1 or 3, so we just try to install both these packages.
+          apk add openssl1.1-compat-dev || apk add openssl-dev
           git config --global --add safe.directory /mnt
           cd /mnt
           BUILD_DIR=build_abi BUILD_FORCE_REMOVE=true ./bootstrap -DENABLE_MULTINODE_TESTS=ON
@@ -121,19 +112,11 @@ jobs:
       run: |
         TEST_IMAGE="postgres:${{ matrix.tester }}-alpine"
 
-        # if [[ "${{ matrix.test }}" == *backward ]]; then
-        #   EXTRA_PKGS="openssl1.1-compat-dev"
-        # else
-        #   EXTRA_PKGS="openssl-dev"
-        # fi
-        # EXTRA_PKGS="openssl1.1-compat-dev"
-
         docker pull ${TEST_IMAGE}
         docker buildx imagetools inspect ${TEST_IMAGE}
         docker run -i --rm -v $(pwd):/mnt -e EXTRA_PKGS="${EXTRA_PKGS}" ${TEST_IMAGE} bash <<"EOF"
           apk add cmake gcc make build-base krb5-dev sudo ${EXTRA_PKGS}
-          apk add openssl1.1-compat-dev
-          apk add openssl-dev
+          apk add openssl1.1-compat-dev || apk add openssl-dev
           cd /mnt
           cp build_abi/install_ext/* `pg_config --sharedir`/extension/
           cp build_abi/install_lib/* `pg_config --pkglibdir`