Merge branch 'main' into KU-1646/add-charm-file-resources

canonical · Nov 12, 2024 · 417f4e9 · 417f4e9
2 parents e3597f2 + 2fffb89
commit 417f4e9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/integration_test.yaml b/.github/workflows/integration_test.yaml
@@ -214,7 +214,7 @@ jobs:
       matrix:
         build: ${{ fromJSON(needs.plan.outputs.plan).build }}
     steps:
-      - uses: canonical/[email protected].1
+      - uses: canonical/[email protected].2
       - name: Set LXC security nesting
         if: ${{ inputs.rockcraft-enable-security-nesting }}
         run: |

diff --git a/dist/build/index.js b/dist/build/index.js
diff --git a/dist/build/index.js.map b/dist/build/index.js.map
diff --git a/tests/workflows/integration/test-upload-charm/build-test-file.sh b/tests/workflows/integration/test-upload-charm/build-test-file.sh
@@ -5,12 +5,12 @@ set -eu
 function build_resource() {
     local RESOURCE_OUTPUT=$1
 
-    case $RESOURCE in
+    case $RESOURCE_OUTPUT in
         test-file.txt)
             touch "$RESOURCE_OUTPUT"
             ;;
         *)
-            echo "Unsupported resource: $RESOURCE"
+            echo "Unsupported resource: $RESOURCE_OUTPUT"
             exit 1
             ;;
     esac