update

Kong · Jan 27, 2025 · 52c59c7 · 52c59c7
1 parent 06b8410
commit 52c59c7
Showing 1 changed file with 18 additions and 14 deletions.
diff --git a/.github/actions/build-wasm-test-filters/action.yml b/.github/actions/build-wasm-test-filters/action.yml
@@ -10,11 +10,13 @@ runs:
     - name: Setup env vars
       shell: bash
       run: |
-        WASM_FILTER_PATH=$PWD/spec/fixtures/proxy_wasm_filters
-        echo "WASM_FILTER_PATH=$WASM_FILTER_PATH" >> $GITHUB_ENV
-        echo "WASM_FIXTURE_PATH=$WASM_FILTER_PATH/build" >> $GITHUB_ENV
-        echo "WASM_FILTER_CARGO_LOCK=$WASM_FILTER_PATH/Cargo.lock" >> $GITHUB_ENV
-        echo "WASM_FILTER_TARGET=wasm32-wasip1" >> "$GITHUB_ENV"
+        FILTER_PATH=$PWD/spec/fixtures/proxy_wasm_filters
+        {
+          echo "WASM_FILTER_PATH=$FILTER_PATH"
+          echo "WASM_FIXTURE_PATH=$FILTER_PATH/build"
+          echo "WASM_FILTER_CARGO_LOCK=$FILTER_PATH/Cargo.lock"
+          echo "WASM_FILTER_TARGET=wasm32-wasip1"
+        } >> $GITHUB_ENV
 
     - name: Setup cache key
       shell: bash
@@ -23,16 +25,18 @@ runs:
         CACHE_VERSION: "5"
         RUNNER_OS: ${{ runner.os }}
       run: |
-        CACHE_PREFIX="wasm-test-filters::v${CACHE_VERSION}::${RUNNER_OS:?}::${WASM_FILTER_TARGET}"
-        echo "CACHE_PREFIX=${CACHE_PREFIX}::" >> $GITHUB_ENV
-        echo "CACHE_KEY=${CACHE_PREFIX}${FILE_HASH}" >> $GITHUB_ENV
+        CACHE_PREFIX="wasm-test-filters::v${CACHE_VERSION}::${RUNNER_OS}::${WASM_FILTER_TARGET}::"
+        {
+          echo "WASM_CACHE_PREFIX=${CACHE_PREFIX}"
+          echo "WASM_CACHE_KEY=${CACHE_PREFIX}${FILE_HASH}"
+        } >> $GITHUB_ENV
 
     - name: Restore Cache
       uses: actions/cache/restore@v4
       id: restore-cache
       with:
         path: ${{ env.WASM_FILTER_PATH }}/target
-        key: ${{ env.CACHE_KEY }}
+        key: ${{ env.WASM_CACHE_KEY }}
 
     - name: Install Rust Toolchain
       if: steps.restore-cache.outputs.cache-hit != 'true'
@@ -49,10 +53,10 @@ runs:
         # building in release mode yields smaller library sizes, so it's
         # better for our cacheability
         cargo build \
-          --manifest-path "${WASM_FILTER_PATH:?}/Cargo.toml"
-          --workspace
-          --lib
-          --target "${WASM_FILTER_TARGET:?}"
+          --manifest-path "${WASM_FILTER_PATH:?}/Cargo.toml" \
+          --workspace \
+          --lib \
+          --target "${WASM_FILTER_TARGET:?}" \
           --release
 
     - name: Save cache
@@ -61,7 +65,7 @@ runs:
       uses: actions/cache/save@v4
       with:
         path: ${{ env.WASM_FILTER_PATH }}/target
-        key: ${{ env.CACHE_KEY }}
+        key: ${{ env.WASM_CACHE_KEY }}
 
     - name: Create a symlink to the target directory
       shell: bash