From 79a692ab5466511a5005dc65fa5ebb01625c6082 Mon Sep 17 00:00:00 2001 From: Marcin Szczepanski Date: Fri, 17 May 2024 15:58:03 +1000 Subject: [PATCH 1/2] Revert "Pin rust to v1.77 (#9696)" This reverts commit c299d7e1eedd3df7f4990167d11d446f9bfa30fe. --- rust-toolchain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain b/rust-toolchain index 3245dca3d0a..2bf5ad0447d 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.77 +stable From 931c4470dbc2fea7094f67019a22486e3de7658b Mon Sep 17 00:00:00 2001 From: Marcin Szczepanski Date: Fri, 17 May 2024 15:58:17 +1000 Subject: [PATCH 2/2] Revert "Fix rustup toolchain version (#9697)" This reverts commit a00769178389ade41252791fa15e47b651ec9d86. --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/release.yml | 8 ++++---- .github/workflows/tag-release.yml | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e9811f30601..3b0e3cc1aaf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: cache: yarn - uses: dtolnay/rust-toolchain@master with: - toolchain: 1.77 + toolchain: stable components: rustfmt # use `--frozen-lockfile` to fail immediately if the committed yarn.lock needs updates # https://yarnpkg.com/lang/en/docs/cli/install/#toc-yarn-install-frozen-lockfile @@ -74,7 +74,7 @@ jobs: node-version: ${{ matrix.node }} - uses: dtolnay/rust-toolchain@master with: - toolchain: 1.77 + toolchain: stable - uses: Swatinem/rust-cache@v2 with: shared-key: ${{ matrix.os }} @@ -112,7 +112,7 @@ jobs: node-version: ${{ matrix.node }} - uses: dtolnay/rust-toolchain@master with: - toolchain: 1.77 + toolchain: stable - uses: Swatinem/rust-cache@v2 with: shared-key: ${{ matrix.os }} @@ -139,7 +139,7 @@ jobs: node-version: 20 - uses: dtolnay/rust-toolchain@master with: - toolchain: 1.77 + toolchain: stable targets: wasm32-unknown-unknown - name: Install wasm-opt run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4ff76272998..eb1ed658fff 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -48,7 +48,7 @@ jobs: - name: Install Rust uses: dtolnay/rust-toolchain@master with: - toolchain: 1.77 + toolchain: stable target: ${{ matrix.target }} - uses: bahmutov/npm-install@v1.8.35 - uses: Swatinem/rust-cache@v2 @@ -98,7 +98,7 @@ jobs: - name: Install Rust uses: actions-rs/toolchain@v1 with: - toolchain: 1.77 + toolchain: stable profile: minimal override: true - uses: bahmutov/npm-install@v1.8.35 @@ -150,7 +150,7 @@ jobs: - name: Install Rust uses: dtolnay/rust-toolchain@master with: - toolchain: 1.77 + toolchain: stable target: ${{ matrix.target }} - name: Install cross compile toolchains run: | @@ -225,7 +225,7 @@ jobs: - name: Install Rust uses: dtolnay/rust-toolchain@master with: - toolchain: 1.77 + toolchain: stable target: ${{ matrix.target }} - uses: bahmutov/npm-install@v1.8.35 - name: Build native packages diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index 1e05362650b..8bcebfccc80 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -29,7 +29,7 @@ jobs: node-version: 20 - uses: dtolnay/rust-toolchain@master with: - toolchain: 1.77 + toolchain: stable targets: wasm32-unknown-unknown - name: Install wasm-opt run: |