Skip to content

Commit 1903d97

Browse files
authored
chore(build): rename rust target wasm32-wasi to wasm32-wasip1 (#13708)
1 parent 3e1faac commit 1903d97

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

.github/actions/build-wasm-test-filters/action.yml

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,17 @@ runs:
1414
echo "WASM_FILTER_PATH=$WASM_FILTER_PATH" >> $GITHUB_ENV
1515
echo "WASM_FIXTURE_PATH=$WASM_FILTER_PATH/build" >> $GITHUB_ENV
1616
echo "WASM_FILTER_CARGO_LOCK=$WASM_FILTER_PATH/Cargo.lock" >> $GITHUB_ENV
17-
echo "WASM_FILTER_CACHE_PREFIX=wasm-test-filters::v3::${{ runner.os }}" >> $GITHUB_ENV
17+
echo "WASM_FILTER_TARGET=wasm32-wasip1" >> "$GITHUB_ENV"
18+
19+
- name: Setup cache key
20+
shell: bash
21+
env:
22+
FILE_HASH: "${{ hashFiles(env.WASM_FILTER_CARGO_LOCK, format('{0}/**/*.rs', env.WASM_FILTER_PATH)) }}"
23+
CACHE_VERSION: "4"
24+
run: |
25+
CACHE_PREFIX="wasm-test-filters::v${CACHE_VERSION}::${{ runner.os }}::${WASM_FILTER_TARGET}"
26+
echo "CACHE_PREFIX=${CACHE_PREFIX}" >> $GITHUB_ENV
27+
echo "CACHE_KEY=${CACHE_PREFIX}::${FILE_HASH}" >> $GITHUB_ENV
1828
1929
- name: Restore Cache
2030
uses: actions/cache/restore@v4
@@ -26,8 +36,8 @@ runs:
2636
~/.cargo/registry/cache/
2737
~/.cargo/git/db/
2838
${{ env.WASM_FILTER_PATH }}/target
29-
key: ${{ env.WASM_FILTER_CACHE_PREFIX }}::${{ hashFiles(env.WASM_FILTER_CARGO_LOCK, format('{0}/**/*.rs', env.WASM_FILTER_PATH)) }}
30-
restore-keys: ${{ env.WASM_FILTER_CACHE_PREFIX }}
39+
key: ${{ env.CACHE_KEY }}
40+
restore-keys: ${{ env.CACHE_PREFIX }}
3141

3242
- name: Install Rust Toolchain
3343
if: steps.restore-cache.outputs.cache-hit != 'true'
@@ -37,7 +47,7 @@ runs:
3747
toolchain: stable
3848
override: true
3949
components: cargo
40-
target: wasm32-wasi
50+
target: ${{ env.WASM_FILTER_TARGET }}
4151

4252
- name: cargo build
4353
if: steps.restore-cache.outputs.cache-hit != 'true'
@@ -50,7 +60,7 @@ runs:
5060
--manifest-path "${{ env.WASM_FILTER_PATH }}/Cargo.toml"
5161
--workspace
5262
--lib
53-
--target wasm32-wasi
63+
--target "${{ env.WASM_FILTER_TARGET }}"
5464
--release
5565
5666
- name: Save cache
@@ -64,14 +74,14 @@ runs:
6474
~/.cargo/registry/cache/
6575
~/.cargo/git/db/
6676
${{ env.WASM_FILTER_PATH }}/target
67-
key: ${{ env.WASM_FILTER_CACHE_PREFIX }}::${{ hashFiles(env.WASM_FILTER_CARGO_LOCK, format('{0}/**/*.rs', env.WASM_FILTER_PATH)) }}
77+
key: ${{ env.CACHE_KEY }}
6878

6979
- name: Create a symlink to the target directory
7080
shell: bash
7181
run: |
7282
ln -sfv \
7383
--no-target-directory \
74-
"${{ env.WASM_FILTER_PATH }}"/target/wasm32-wasi/release \
84+
"${{ env.WASM_FILTER_PATH }}"/target/"${{ env.WASM_FILTER_TARGET }}"/release \
7585
"${{ env.WASM_FIXTURE_PATH }}"
7686
7787
- name: debug

scripts/build-wasm-test-filters.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
set -euo pipefail
2121

22-
readonly BUILD_TARGET=wasm32-wasi
22+
readonly BUILD_TARGET=wasm32-wasip1
2323
readonly FIXTURE_PATH=${PWD}/spec/fixtures/proxy_wasm_filters
2424

2525
readonly INSTALL_ROOT=${PWD}/bazel-bin/build/${BUILD_NAME:-kong-dev}

0 commit comments

Comments
 (0)