Fix ref handling

ckan · Nov 18, 2024 · ad1845b · ad1845b
1 parent 03cac25
commit ad1845b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build-and-test-2.9-py3.yml b/.github/workflows/build-and-test-2.9-py3.yml
@@ -9,4 +9,4 @@ jobs:
       ckan-major-version: "2.9"
       base-tag: "ckan/ckan-base:2.9"
       dev-tag: "ckan/ckan-dev:2.9"
-      docker-file: "Dockerfile.py3.10"
+      docker-file: "Dockerfile.py3.9"
diff --git a/.github/workflows/reusable-build-and-test.yml b/.github/workflows/reusable-build-and-test.yml
@@ -53,7 +53,7 @@ jobs:
           VERSION_VALUE=$(cat "ckan-${{ inputs.ckan-major-version }}/VERSION.txt")
           if [[ $VERSION_VALUE != "master" ]]; then VERSION_VALUE="ckan-$VERSION_VALUE"; fi
           echo "Using ref $VERSION_VALUE in next steps"
-          echo "CKAN_VERSION=$VERSION_VALUE" >> $GITHUB_ENV
+          echo "CKAN_REF=$VERSION_VALUE" >> $GITHUB_ENV
 
       - name: Build base image
         uses: docker/build-push-action@v6
@@ -63,7 +63,7 @@ jobs:
           context: "{{defaultContext}}:ckan-${{ inputs.ckan-major-version }}"
           file: ${{ inputs.docker-file }}
           build-args: |
-            CKAN_REF=ckan-${{ env.CKAN_VERSION }}
+            CKAN_REF=${{ env.CKAN_REF }}
             ENV=base
           tags: |
             ${{ inputs.base-tag }}
@@ -91,7 +91,7 @@ jobs:
           context: "{{defaultContext}}:ckan-${{ inputs.ckan-major-version }}"
           file: ${{ inputs.docker-file }}
           build-args: |
-            CKAN_REF=ckan-${{ env.CKAN_VERSION }}
+            CKAN_REF=${{ env.CKAN_REF }}
             ENV=dev
           tags: |
             ${{ inputs.dev-tag }}