From 47475f46ce9d3ad2c1429e0b660d662b4687a732 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 20 Oct 2022 11:54:09 -0700 Subject: [PATCH 1/7] Upgrade our github actions to "node16" Each github actions run has a lot of warnings about using node12 so this upgrades our repository to using node16. I'm hoping no other changes are needed and I suspect other actions we're using are on node12 and will need further updates, but this should help pin down what's remaining. --- .github/actions/binary-compatible-builds/action.yml | 2 +- .github/actions/github-release/action.yml | 2 +- .github/actions/install-rust/action.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/binary-compatible-builds/action.yml b/.github/actions/binary-compatible-builds/action.yml index c2950d99b02b..b5a190c4a06f 100644 --- a/.github/actions/binary-compatible-builds/action.yml +++ b/.github/actions/binary-compatible-builds/action.yml @@ -2,7 +2,7 @@ name: 'Set up a CentOS 6 container to build releases in' description: 'Set up a CentOS 6 container to build releases in' runs: - using: node12 + using: node16 main: 'main.js' inputs: name: diff --git a/.github/actions/github-release/action.yml b/.github/actions/github-release/action.yml index 3225a91dbbe2..17c4715b9c12 100644 --- a/.github/actions/github-release/action.yml +++ b/.github/actions/github-release/action.yml @@ -8,5 +8,5 @@ inputs: description: '' required: true runs: - using: 'node12' + using: 'node16' main: 'main.js' diff --git a/.github/actions/install-rust/action.yml b/.github/actions/install-rust/action.yml index 7a196591840d..6afc01d6f234 100644 --- a/.github/actions/install-rust/action.yml +++ b/.github/actions/install-rust/action.yml @@ -8,5 +8,5 @@ inputs: default: 'stable' runs: - using: node12 + using: node16 main: 'main.js' From 69614f2fae274b365329e17fb37bc97064b1ad13 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 20 Oct 2022 11:58:47 -0700 Subject: [PATCH 2/7] Update `actions/checkout` workflow to `v3` --- .github/workflows/cargo-audit.yml | 2 +- .github/workflows/main.yml | 28 +++++++++++------------ .github/workflows/publish-to-cratesio.yml | 2 +- .github/workflows/push-tag.yml | 2 +- .github/workflows/release-process.yml | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/cargo-audit.yml b/.github/workflows/cargo-audit.yml index 4c24d366c84a..951fe2ca6780 100644 --- a/.github/workflows/cargo-audit.yml +++ b/.github/workflows/cargo-audit.yml @@ -6,7 +6,7 @@ jobs: security_audit: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true - uses: actions-rs/audit-check@v1 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a3c05f999043..978824ab35cb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,7 +21,7 @@ jobs: name: Rustfmt runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true - uses: ./.github/actions/install-rust @@ -34,7 +34,7 @@ jobs: name: Cargo deny runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true - uses: ./.github/actions/install-rust @@ -52,7 +52,7 @@ jobs: env: CARGO_VET_VERSION: 0.3.0 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true - uses: ./.github/actions/install-rust @@ -72,7 +72,7 @@ jobs: RUSTDOCFLAGS: -Dbroken_intra_doc_links --cfg nightlydoc OPENVINO_SKIP_LINKING: 1 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true - uses: ./.github/actions/install-rust @@ -137,7 +137,7 @@ jobs: name: Check runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true - uses: ./.github/actions/install-rust @@ -190,7 +190,7 @@ jobs: name: Check Windows ARM64 runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true - uses: ./.github/actions/install-rust @@ -201,7 +201,7 @@ jobs: name: Fuzz Targets runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true # Note that building with fuzzers requires nightly since it uses unstable @@ -254,7 +254,7 @@ jobs: qemu: qemu-riscv64 -L /usr/riscv64-linux-gnu qemu_target: riscv64-linux-user steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true - uses: ./.github/actions/install-rust @@ -347,7 +347,7 @@ jobs: name: Test wasi-nn module runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true - uses: ./.github/actions/install-rust @@ -362,7 +362,7 @@ jobs: name: Test wasi-crypto module runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true - run: rustup update stable && rustup default stable @@ -375,7 +375,7 @@ jobs: name: Run benchmarks runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true - uses: ./.github/actions/install-rust @@ -387,7 +387,7 @@ jobs: name: Meta deterministic check runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true - uses: ./.github/actions/install-rust @@ -425,7 +425,7 @@ jobs: os: ubuntu-latest target: riscv64gc-unknown-linux-gnu steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true - uses: ./.github/actions/install-rust @@ -472,7 +472,7 @@ jobs: if: github.repository == 'bytecodealliance/wasmtime' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true - run: rustup update stable && rustup default stable diff --git a/.github/workflows/publish-to-cratesio.yml b/.github/workflows/publish-to-cratesio.yml index 7fe1991f4e34..6d05b66778a4 100644 --- a/.github/workflows/publish-to-cratesio.yml +++ b/.github/workflows/publish-to-cratesio.yml @@ -14,7 +14,7 @@ jobs: if: github.repository == 'bytecodealliance/wasmtime' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true - run: rustup update stable && rustup default stable diff --git a/.github/workflows/push-tag.yml b/.github/workflows/push-tag.yml index 97c67608fbd7..e7e63cb33f64 100644 --- a/.github/workflows/push-tag.yml +++ b/.github/workflows/push-tag.yml @@ -17,7 +17,7 @@ jobs: if: github.repository == 'bytecodealliance/wasmtime' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true fetch-depth: 0 diff --git a/.github/workflows/release-process.yml b/.github/workflows/release-process.yml index 4fe7e5b465fc..fcbc8382f80c 100644 --- a/.github/workflows/release-process.yml +++ b/.github/workflows/release-process.yml @@ -38,7 +38,7 @@ jobs: name: Run the release process runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true - name: Setup From 69ee3d11799f8ffb71c70ba83126e78569b6b2fe Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 20 Oct 2022 12:01:32 -0700 Subject: [PATCH 3/7] Update to `actions/cache@v3` --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 978824ab35cb..76b583a5dd99 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -56,7 +56,7 @@ jobs: with: submodules: true - uses: ./.github/actions/install-rust - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ${{ runner.tool_cache }}/cargo-vet key: cargo-vet-bin-${{ env.CARGO_VET_VERSION }} @@ -86,7 +86,7 @@ jobs: - run: cd crates/c-api && doxygen doxygen.conf # install mdbook, build the docs, and test the docs - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ${{ runner.tool_cache }}/mdbook key: cargo-mdbook-bin-${{ env.CARGO_MDBOOK_VERSION }} @@ -271,7 +271,7 @@ jobs: - run: cargo fetch --locked - run: cargo fetch --locked --manifest-path crates/test-programs/wasi-tests/Cargo.toml - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ${{ runner.tool_cache }}/qemu key: qemu-${{ matrix.target }}-${{ env.QEMU_BUILD_VERSION }}-patchmadvise2 From 079f2969d97de31358cbe63fbfb9051a563993ea Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 20 Oct 2022 12:02:30 -0700 Subject: [PATCH 4/7] Update to `actions/upload-artifact@v3` --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 76b583a5dd99..e01477a41747 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -113,7 +113,7 @@ jobs: mv crates/c-api/html gh-pages/c-api mv target/doc gh-pages/api tar czf gh-pages.tar.gz gh-pages - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: gh-pages path: gh-pages.tar.gz @@ -450,7 +450,7 @@ jobs: # Assemble release artifats appropriate for this platform, then upload them # unconditionally to this workflow's files so we have a copy of them. - run: ./ci/build-tarballs.sh "${{ matrix.build }}" "${{ matrix.target }}" - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v3 with: name: bins-${{ matrix.build }} path: dist From 648ac15ca09111a2cf73d5c061dd63e57dafc12c Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 20 Oct 2022 12:03:24 -0700 Subject: [PATCH 5/7] Drop usage of `actions-rs/toolchain` --- .github/workflows/performance.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml index 9f9dd78ca218..da1f7bc01aeb 100644 --- a/.github/workflows/performance.yml +++ b/.github/workflows/performance.yml @@ -77,11 +77,7 @@ jobs: submodules: true path: wasmtime_commit - - name: Get latest rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: nightly - override: true + - run: rustup update nightly && rustup default nightly - name: Build patch from bytecodealliance/wasmtime (pushed and triggering on this perf repo) working-directory: ./wasmtime_commit From 003cb86e55ad3519704aa7a6ff823f29d11ac208 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 20 Oct 2022 12:03:55 -0700 Subject: [PATCH 6/7] Update to `actions/setup-python@v4` --- .github/workflows/performance.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml index da1f7bc01aeb..e12803621a51 100644 --- a/.github/workflows/performance.yml +++ b/.github/workflows/performance.yml @@ -116,7 +116,7 @@ jobs: ./target/release/sightglass-cli summarize --input-format csv --output-format csv -f /tmp/results.csv > /tmp/results_summarized.csv - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: '3.9' From 8b5ae1ea926d0122af7a1989f0becfa7d58b40a4 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 20 Oct 2022 12:12:53 -0700 Subject: [PATCH 7/7] Update mdbook version --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e01477a41747..ab003114e8f3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -68,7 +68,7 @@ jobs: name: Doc build runs-on: ubuntu-latest env: - CARGO_MDBOOK_VERSION: 0.4.8 + CARGO_MDBOOK_VERSION: 0.4.21 RUSTDOCFLAGS: -Dbroken_intra_doc_links --cfg nightlydoc OPENVINO_SKIP_LINKING: 1 steps: