Fix CHARM_PATH

canonical · Apr 24, 2024 · c6bd307 · c6bd307
1 parent 05f31cd
commit c6bd307
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/.github/workflows/build-charm.yaml b/.github/workflows/build-charm.yaml
@@ -34,9 +34,15 @@ jobs:
         id: cache-charm
         uses: actions/cache@v4
         with:
-          path: ${{ inputs.working-directory }}/packed/
+          path: ${{ inputs.working-directory }}packed/
           key: ${{ runner.os}}-${{ env.CHARM_NAME }}-charm-${{ env.SRC_HASH }}
 
+      - name: Use cached charm
+        if: ${{ env.CHARM_NAME != 'UNKNOWN' && steps.cache-charm.outputs.cache-hit == 'true' }}
+        working-directory: ${{ inputs.working-directory }}/${{ matrix.path }}
+        run: |
+          echo "CHARM_FILE=$(ls packed/${{env.CHARM_NAME}}_*.charm)" >> $GITHUB_ENV
+
       - name: Pack charm
         if: ${{ env.CHARM_NAME != 'UNKNOWN' && !cancelled() && steps.cache-charm.outputs.cache-hit != 'true' }}
         working-directory: ${{ inputs.working-directory }}/${{ matrix.path }}
@@ -52,5 +58,5 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: ${{ env.CHARM_NAME }}-charm
-          path: ${{ inputs.working-directory }}/packed/${{ env.CHARM_FILE }}
+          path: ${{ inputs.working-directory }}/${{ env.CHARM_FILE }}
           if-no-files-found: error