Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

upgrade to rust-1.70 #2563

Merged
merged 3 commits into from
Jul 5, 2023
Merged

upgrade to rust-1.70 #2563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79d9bb0
upgrade to rust-1.70
zjb0807 Jun 24, 2023
f1af1d3
Merge branch 'master' into upgrade-rust1.70
zjb0807 Jul 5, 2023
6c0c331
update orml
zjb0807 Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/benchmark.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml.src
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-tokens.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion orml
Open in desktop
Submodule orml updated 6 files
+1 −1 .github/workflows/coverage.yml
+1 −1 .github/workflows/master.yml.disabled
+1 −1 .github/workflows/test.yml
+1 −1 authority/src/mock.rs
+1 −1 bencher/src/build_wasm/prerequisites.rs
+1 −1 githooks/pre-commit
4 changes: 2 additions & 2 deletions scripts/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" && \
Expand Down
4 changes: 2 additions & 2 deletions scripts/init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions scripts/profiling/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" && \
Expand Down
Loading