From 79d9bb0d1085d98c354e80162353a527de6fb43c Mon Sep 17 00:00:00 2001 From: zjb0807 Date: Fri, 23 Jun 2023 22:06:06 -0400 Subject: [PATCH 1/2] upgrade to rust-1.70 --- .github/workflows/benchmark.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/publish-release.yml | 2 +- .github/workflows/test.yml | 8 ++++---- .github/workflows/test.yml.src | 2 +- .github/workflows/update-tokens.yml | 2 +- scripts/Dockerfile | 4 ++-- scripts/init.sh | 4 ++-- scripts/profiling/Dockerfile | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index b330ab3300..1811f86374 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -75,7 +75,7 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: nightly-2023-03-04 + toolchain: nightly-2023-04-15 components: rustfmt target: wasm32-unknown-unknown default: true diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index a928e0e34d..d06c0fc66a 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -47,7 +47,7 @@ jobs: - name: Install toolchain uses: dtolnay/rust-toolchain@nightly with: - toolchain: nightly-2023-03-04 + toolchain: nightly-2023-04-15 components: rustfmt target: wasm32-unknown-unknown - name: Setup cmake diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 33541631e2..495c0c51f5 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -39,7 +39,7 @@ on: required: false env: - SUBWASM_VERSION: 0.19.1 + SUBWASM_VERSION: 0.20.0 CHAIN: ${{ github.event.inputs.chain }} SCOPE: ${{ github.event.inputs.scope }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1cc4c614fb..18ddacb502 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -44,7 +44,7 @@ jobs: - name: Install toolchain uses: dtolnay/rust-toolchain@nightly with: - toolchain: nightly-2023-03-04 + toolchain: nightly-2023-04-15 components: rustfmt target: wasm32-unknown-unknown - name: Setup cmake @@ -83,7 +83,7 @@ jobs: - name: Install toolchain uses: dtolnay/rust-toolchain@nightly with: - toolchain: nightly-2023-03-04 + toolchain: nightly-2023-04-15 components: rustfmt target: wasm32-unknown-unknown - name: Setup cmake @@ -110,7 +110,7 @@ jobs: - name: Install toolchain uses: dtolnay/rust-toolchain@nightly with: - toolchain: nightly-2023-03-04 + toolchain: nightly-2023-04-15 components: rustfmt target: wasm32-unknown-unknown - name: Setup cmake @@ -145,7 +145,7 @@ jobs: - name: Install toolchain uses: dtolnay/rust-toolchain@nightly with: - toolchain: nightly-2023-03-04 + toolchain: nightly-2023-04-15 components: rustfmt target: wasm32-unknown-unknown - name: Setup cmake diff --git a/.github/workflows/test.yml.src b/.github/workflows/test.yml.src index bd8c06249a..ee143c19c2 100644 --- a/.github/workflows/test.yml.src +++ b/.github/workflows/test.yml.src @@ -48,7 +48,7 @@ jobs: name: Install toolchain uses: dtolnay/rust-toolchain@nightly with: - toolchain: nightly-2023-03-04 + toolchain: nightly-2023-04-15 components: rustfmt target: wasm32-unknown-unknown - name: Check format diff --git a/.github/workflows/update-tokens.yml b/.github/workflows/update-tokens.yml index 35575716b7..9e3082b53e 100644 --- a/.github/workflows/update-tokens.yml +++ b/.github/workflows/update-tokens.yml @@ -20,7 +20,7 @@ jobs: - name: Install toolchain uses: dtolnay/rust-toolchain@nightly with: - toolchain: nightly-2023-03-04 + toolchain: nightly-2023-04-15 components: rustfmt target: wasm32-unknown-unknown - name: update tokens diff --git a/scripts/Dockerfile b/scripts/Dockerfile index 2ace9276b8..c8053685d1 100644 --- a/scripts/Dockerfile +++ b/scripts/Dockerfile @@ -1,8 +1,8 @@ FROM rust:buster as builder WORKDIR /app -RUN rustup default nightly-2023-03-04 && \ - rustup target add wasm32-unknown-unknown --toolchain nightly-2023-03-04 +RUN rustup default nightly-2023-04-15 && \ + rustup target add wasm32-unknown-unknown --toolchain nightly-2023-04-15 RUN apt-get update && \ apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \ diff --git a/scripts/init.sh b/scripts/init.sh index 2b090d4159..9a424454d2 100755 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -4,6 +4,6 @@ set -e echo "*** Initializing WASM build environment" -rustup default nightly-2023-03-04 +rustup default nightly-2023-04-15 -rustup target add wasm32-unknown-unknown --toolchain nightly-2023-03-04 +rustup target add wasm32-unknown-unknown --toolchain nightly-2023-04-15 diff --git a/scripts/profiling/Dockerfile b/scripts/profiling/Dockerfile index ea661c6191..08563a05b6 100644 --- a/scripts/profiling/Dockerfile +++ b/scripts/profiling/Dockerfile @@ -1,8 +1,8 @@ FROM rust:buster as builder WORKDIR /app -RUN rustup default nightly-2023-03-04 && \ - rustup target add wasm32-unknown-unknown --toolchain nightly-2023-03-04 +RUN rustup default nightly-2023-04-15 && \ + rustup target add wasm32-unknown-unknown --toolchain nightly-2023-04-15 RUN apt-get update && \ apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \ From 6c0c3316ff112b8a8f60ac880aca4b827a734888 Mon Sep 17 00:00:00 2001 From: zjb0807 Date: Wed, 5 Jul 2023 09:28:39 +0800 Subject: [PATCH 2/2] update orml --- orml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orml b/orml index 041006c4f8..ca05423f4f 160000 --- a/orml +++ b/orml @@ -1 +1 @@ -Subproject commit 041006c4f86dbc0c31f18580df1412c10f8a1b71 +Subproject commit ca05423f4f32be1d30765caacdc7d90130f5554a