From 1054e65b29e24f203d57485733658ce62a378b0f Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Fri, 15 Sep 2023 08:21:53 +0000 Subject: [PATCH] Merge pull request #997 from UniqueNetwork/ci/small-fix update toolchain version --- --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -13,8 +13,8 @@ [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \ nvm install v16.2.0 && \ npm install -g yarn && \ - rustup toolchain install nightly-2021-11-11 && \ - rustup default nightly-2021-11-11 && \ + rustup toolchain install nightly-2023-05-22 && \ + rustup default nightly-2023-05-22 && \ rustup target add wasm32-unknown-unknown && \ rustup component add rustfmt clippy && \ cargo install cargo-expand cargo-edit cargo-contract --- a/.docker/additional/Dockerfile-chainql +++ b/.docker/additional/Dockerfile-chainql @@ -15,11 +15,11 @@ RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none RUN rustup toolchain uninstall $(rustup toolchain list) && \ - rustup toolchain install nightly-2022-11-15 && \ - rustup default nightly-2022-11-15 && \ + rustup toolchain install nightly-2023-05-22 && \ + rustup default nightly-2023-05-22 && \ rustup target list --installed && \ rustup show -RUN rustup target add wasm32-unknown-unknown --toolchain nightly-2022-11-15 +RUN rustup target add wasm32-unknown-unknown --toolchain nightly-2023-05-22 RUN mkdir /unique_parachain WORKDIR /unique_parachain --- a/.docker/additional/Dockerfile-polkadot +++ b/.docker/additional/Dockerfile-polkadot @@ -2,7 +2,7 @@ FROM ubuntu:22.04 as rust-builder LABEL maintainer="Unique.Network" -ARG RUST_TOOLCHAIN=nightly-2022-10-09 +ARG RUST_TOOLCHAIN=nightly-2023-05-22 ENV CARGO_HOME="/cargo-home" ENV PATH="/cargo-home/bin:$PATH" --- a/.github/workflows/forkless-update-data.yml +++ b/.github/workflows/forkless-update-data.yml @@ -40,7 +40,7 @@ network {quartz}, mainnet_branch {${{ env.QUARTZ_MAINNET_BRANCH }}}, relay_branch {${{ env.KUSAMA_MAINNET_BRANCH }}}, runtime_features {quartz-runtime}, wasm_name {quartz}, fork_source {${{ env.QUARTZ_REPLICA_FROM }}} network {unique}, mainnet_branch {${{ env.UNIQUE_MAINNET_BRANCH }}}, relay_branch {${{ env.POLKADOT_MAINNET_BRANCH }}}, runtime_features {unique-runtime}, wasm_name {unique}, fork_source {${{ env.UNIQUE_REPLICA_FROM }}} - forkless-data-build: + forkless-data: needs: prepare-execution-matrix # The type of runner that the job will run on @@ -48,7 +48,7 @@ timeout-minutes: 1380 - name: ${{ matrix.network }}-data-build + name: ${{ matrix.network }}-data continue-on-error: true #Do not stop testing of matrix runs failed. As it decided during PR review - it required 50/50& Let's check it with false. --- a/.github/workflows/forkless-update-nodata.yml +++ b/.github/workflows/forkless-update-nodata.yml @@ -40,7 +40,7 @@ network {quartz}, mainnet_branch {${{ env.QUARTZ_MAINNET_BRANCH }}}, relay_branch {${{ env.KUSAMA_MAINNET_BRANCH }}}, runtime_features {quartz-runtime}, wasm_name {quartz} network {unique}, mainnet_branch {${{ env.UNIQUE_MAINNET_BRANCH }}}, relay_branch {${{ env.POLKADOT_MAINNET_BRANCH }}}, runtime_features {unique-runtime}, wasm_name {unique} - forkless-nodata-build: + forkless-nodata: needs: prepare-execution-matrix # The type of runner that the job will run on @@ -48,7 +48,7 @@ timeout-minutes: 1380 - name: ${{ matrix.network }}-nodata-build + name: ${{ matrix.network }}-nodata continue-on-error: true #Do not stop testing of matrix runs failed. As it decided during PR review - it required 50/50& Let's check it with false. --- a/.github/workflows/node-only-update.yml +++ b/.github/workflows/node-only-update.yml @@ -42,7 +42,7 @@ network {quartz}, mainnet_branch {${{ env.QUARTZ_MAINNET_BRANCH }}}, relay_branch {${{ env.KUSAMA_MAINNET_BRANCH }}}, runtime_features {quartz-runtime} network {unique}, mainnet_branch {${{ env.UNIQUE_MAINNET_BRANCH }}}, relay_branch {${{ env.POLKADOT_MAINNET_BRANCH }}}, runtime_features {unique-runtime} - node-only-update-build: + node-only-update: needs: prepare-execution-matrix # The type of runner that the job will run on @@ -50,7 +50,7 @@ timeout-minutes: 2880 # 48 hours for execution jobs. - name: ${{ matrix.network }}-build + name: ${{ matrix.network }} continue-on-error: true #Do not stop testing of matrix runs failed. As it decided during PR review - it required 50/50& Let's check it with false. --- a/.github/workflows/xcm.yml +++ b/.github/workflows/xcm.yml @@ -1,4 +1,4 @@ -name: xcm-testnet-build +name: xcm-testnet # Controls when the action will run. on: @@ -44,7 +44,7 @@ network {quartz}, relay_branch {${{ env.KUSAMA_MAINNET_BRANCH }}}, acala_version {${{ env.KARURA_BUILD_BRANCH }}}, moonbeam_version {${{ env.MOONRIVER_BUILD_BRANCH }}}, cumulus_version {${{ env.STATEMINE_BUILD_BRANCH }}}, astar_version {${{ env.SHIDEN_BUILD_BRANCH }}}, polkadex_version {${{ env.POLKADEX_BUILD_BRANCH }}}, runtest {testXcmQuartz}, runtime_features {quartz-runtime} network {unique}, relay_branch {${{ env.POLKADOT_MAINNET_BRANCH }}}, acala_version {${{ env.ACALA_BUILD_BRANCH }}}, moonbeam_version {${{ env.MOONBEAM_BUILD_BRANCH }}}, cumulus_version {${{ env.STATEMINT_BUILD_BRANCH }}}, astar_version {${{ env.ASTAR_BUILD_BRANCH }}}, polkadex_version {${{ env.POLKADEX_BUILD_BRANCH }}}, runtest {testXcmUnique}, runtime_features {unique-runtime} - xcm-build: + xcm: needs: prepare-execution-marix # The type of runner that the job will run on @@ -52,7 +52,7 @@ timeout-minutes: 600 - name: ${{ matrix.network }}-build + name: ${{ matrix.network }} continue-on-error: true #Do not stop testing of matrix runs failed. As it decided during PR review - it required 50/50& Let's check it with false. --- a/README.md +++ b/README.md @@ -52,17 +52,17 @@ 2. Remove all installed toolchains with `rustup toolchain list` and `rustup toolchain uninstall `. -3. Install toolchain nightly-2022-11-15 and make it default: +3. Install toolchain nightly-2023-05-22 and make it default: ```bash -rustup toolchain install nightly-2022-11-15 -rustup default nightly-2022-11-15 +rustup toolchain install nightly-2023-05-22 +rustup default nightly-2023-05-22 ``` 4. Add wasm target for nightly toolchain: ```bash -rustup target add wasm32-unknown-unknown --toolchain nightly-2022-11-15 +rustup target add wasm32-unknown-unknown --toolchain nightly-2023-05-22 ``` 5. Build: --- a/tests/README.md +++ b/tests/README.md @@ -8,7 +8,7 @@ git checkout release-v0.9.27 ``` -2. Build with nightly-2022-05-11 +2. Build with nightly-2023-05-22 ```bash cargo build --release ``` -- gitstuff