Update extension-test.yml

femiwiki · Sep 21, 2024 · 30f9b48 · 30f9b48
1 parent 196aeef
commit 30f9b48
Showing 1 changed file with 25 additions and 11 deletions.
diff --git a/.github/workflows/extension-test.yml b/.github/workflows/extension-test.yml
@@ -90,11 +90,11 @@ jobs:
             grep -v latest | sort -Vr | head -1)"
           echo "DOCKER_LATEST_TAG=${DOCKER_LATEST_TAG}" >> $GITHUB_ENV
           if [ "${{ matrix.stage }}" == 'phan' ]; then
-            echo "QUIBBLE_DOCKER_LATEST_TAG=$(curl -sL "https://${DOCKER_REGISTRY}/v2/${DOCKER_ORG}/${QUIBBLE_DOCKER_IMAGE}/tags/list" |
+            echo "PHAN_DOCKER_LATEST_TAG=$(curl -sL "https://${DOCKER_REGISTRY}/v2/${DOCKER_ORG}/${PHAN_DOCKER_IMAGE}/tags/list" |
               python3 -c 'import json;print("\n".join(json.loads(input())["tags"]))' |
               grep -v latest | sort -Vr | head -1)" >> $GITHUB_ENV
           elif [ "${{ matrix.stage }}" == 'coverage' ]; then
-            echo "QUIBBLE_DOCKER_LATEST_TAG=${DOCKER_LATEST_TAG}" >> $GITHUB_ENV
+            echo "COVERAGE_DOCKER_LATEST_TAG=${DOCKER_LATEST_TAG}" >> $GITHUB_ENV
           fi
 
           # Resolve dependencies
@@ -117,19 +117,33 @@ jobs:
           else
             docker pull "${DOCKER_REGISTRY}/${DOCKER_ORG}/${DOCKER_IMAGE}:${DOCKER_LATEST_TAG}"
           fi
-      - name: Cache quibble docker image
-        if: ${{ matrix.stage == 'coverage' || matrix.stage == 'phan' }}
+      - name: Cache quibble coverage docker image
+        if: matrix.stage == 'coverage'
         uses: actions/cache@v3
         with:
-          path: /home/runner/docker-images/${{ env.QUIBBLE_DOCKER_IMAGE }}
-          key: ${{ env.QUIBBLE_DOCKER_IMAGE }}:${{ env.QUIBBLE_DOCKER_LATEST_TAG }}
-      - name: Load or pull quibble docker image
-        if: ${{ matrix.stage == 'coverage' || matrix.stage == 'phan' }}
+          path: /home/runner/docker-images/${{ env.COVERAGE_DOCKER_IMAGE }}
+          key: ${{ env.COVERAGE_DOCKER_IMAGE }}:${{ env.COVERAGE_DOCKER_LATEST_TAG }}
+      - name: Cache phan docker image
+        if: matrix.stage == 'phan'
+        uses: actions/cache@v3
+        with:
+          path: /home/runner/docker-images/${{ env.PHAN_DOCKER_IMAGE }}
+          key: ${{ env.PHAN_DOCKER_IMAGE }}:${{ env.PHAN_DOCKER_LATEST_TAG }}
+      - name: Load or pull quibble coverage docker image
+        if: matrix.stage == 'coverage'
+        run: |
+          if [ -f /home/runner/docker-images/"${COVERAGE_DOCKER_IMAGE}" ]; then
+            docker load -i /home/runner/docker-images/"${COVERAGE_DOCKER_IMAGE}"
+          else
+            docker pull "${DOCKER_REGISTRY}/${DOCKER_ORG}/${COVERAGE_DOCKER_IMAGE}:${COVERAGE_DOCKER_LATEST_TAG}"
+          fi
+      - name: Load or pull phan docker image
+        if: matrix.stage == 'phan'
         run: |
-          if [ -f /home/runner/docker-images/"${QUIBBLE_DOCKER_IMAGE}" ]; then
-            docker load -i /home/runner/docker-images/"${QUIBBLE_DOCKER_IMAGE}"
+          if [ -f /home/runner/docker-images/"${PHAN_DOCKER_IMAGE}" ]; then
+            docker load -i /home/runner/docker-images/"${PHAN_DOCKER_IMAGE}"
           else
-            docker pull "${DOCKER_REGISTRY}/${DOCKER_ORG}/${QUIBBLE_DOCKER_IMAGE}:${QUIBBLE_DOCKER_LATEST_TAG}"
+            docker pull "${DOCKER_REGISTRY}/${DOCKER_ORG}/${PHAN_DOCKER_IMAGE}:${PHAN_DOCKER_LATEST_TAG}"
           fi
 
       - name: Cache MediaWiki installation