From 91d18265cd1235f12e274d59a648b8a937a55f3f Mon Sep 17 00:00:00 2001 From: Sven Klemm Date: Mon, 24 Feb 2025 11:30:05 +0100 Subject: [PATCH] Fix ABI CI workflow Don't pin tester image for ABI test to specific alpine version --- .github/workflows/abi.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/abi.yaml b/.github/workflows/abi.yaml index c99594ada4b..c14cbbdeb8b 100644 --- a/.github/workflows/abi.yaml +++ b/.github/workflows/abi.yaml @@ -48,17 +48,17 @@ jobs: pg: [ 14, 15, 16, 17 ] include: - pg: 14 - builder: ${{ fromJson(needs.config.outputs.pg14_abi_min) }}-alpine - tester: ${{ fromJson(needs.config.outputs.pg14_latest) }}-alpine3.19 + builder: ${{ fromJson(needs.config.outputs.pg14_abi_min) }} + tester: ${{ fromJson(needs.config.outputs.pg14_latest) }} - pg: 15 - builder: ${{ fromJson(needs.config.outputs.pg15_abi_min) }}-alpine - tester: ${{ fromJson(needs.config.outputs.pg15_latest) }}-alpine3.19 + builder: ${{ fromJson(needs.config.outputs.pg15_abi_min) }} + tester: ${{ fromJson(needs.config.outputs.pg15_latest) }} - pg: 16 - builder: ${{ fromJson(needs.config.outputs.pg16_abi_min) }}-alpine - tester: ${{ fromJson(needs.config.outputs.pg16_latest) }}-alpine3.19 + builder: ${{ fromJson(needs.config.outputs.pg16_abi_min) }} + tester: ${{ fromJson(needs.config.outputs.pg16_latest) }} - pg: 17 - builder: ${{ fromJson(needs.config.outputs.pg17_abi_min) }}-alpine - tester: ${{ fromJson(needs.config.outputs.pg17_latest) }}-alpine3.19 + builder: ${{ fromJson(needs.config.outputs.pg17_abi_min) }} + tester: ${{ fromJson(needs.config.outputs.pg17_latest) }} steps: @@ -67,7 +67,7 @@ jobs: - name: Build extension with ${{ matrix.builder }} run: | - BUILDER_IMAGE="postgres:${{matrix.builder}}" + BUILDER_IMAGE="postgres:${{matrix.builder}}-alpine" docker pull ${BUILDER_IMAGE} docker buildx imagetools inspect ${BUILDER_IMAGE} @@ -91,7 +91,7 @@ jobs: - name: Run tests on server ${{ matrix.tester }} run: | - TEST_IMAGE="postgres:${{ matrix.tester }}" + TEST_IMAGE="postgres:${{ matrix.tester }}-alpine" docker pull ${TEST_IMAGE} docker buildx imagetools inspect ${TEST_IMAGE}