From 3de47f878d5e257e75fb1f5b5afc627d2857708b Mon Sep 17 00:00:00 2001 From: Marcin Date: Fri, 24 Mar 2023 10:51:35 +0100 Subject: [PATCH 01/40] Revamp of actions part #2 --- .../action.yml | 12 ++++++------ .github/actions/get-ref-properties/action.yml | 5 +++++ .github/workflows/_build-test-node-and-runtime.yml | 5 ++--- .github/workflows/deploy-feature-envs.yaml | 6 +++--- 4 files changed, 16 insertions(+), 12 deletions(-) rename .github/actions/{destroy-feature-environment => delete-feature-environment}/action.yml (87%) diff --git a/.github/actions/destroy-feature-environment/action.yml b/.github/actions/delete-feature-environment/action.yml similarity index 87% rename from .github/actions/destroy-feature-environment/action.yml rename to .github/actions/delete-feature-environment/action.yml index 9e744eaaf4..26704d3abe 100644 --- a/.github/actions/destroy-feature-environment/action.yml +++ b/.github/actions/delete-feature-environment/action.yml @@ -19,13 +19,13 @@ inputs: outputs: deployment-name: description: 'Output with a deployment name for working with deployments' - value: ${{ steps.get_branch.outputs.branch_name }} + value: ${{ steps.get-ref-properties.outputs.branch-name-flattened }} runs: using: "composite" steps: - name: Get branch name and commit SHA - id: get_branch - uses: ./.github/actions/get-branch + id: get-ref-properties + uses: ./.github/actions/get-ref-properties - name: Checkout aleph-apps repo uses: actions/checkout@v3 @@ -47,7 +47,7 @@ runs: - name: Destroy feature branch shell: bash env: - APP_NAME: fe-${{ steps.get_branch.outputs.branch_appname }} + APP_NAME: fe-${{ steps.get-ref-properties.outputs.branch-name-for-argo }} run: | ALEPH_PATH=$(pwd) @@ -57,7 +57,7 @@ runs: - name: Commit deletion of the feature environment. uses: EndBug/add-and-commit@v9.1.1 env: - APP_NAME: fe-${{ steps.get_branch.outputs.branch_appname }} + APP_NAME: fe-${{ steps.get-ref-properties.outputs.branch-name-for-argo }} with: author_name: AlephZero Automation author_email: alephzero@10clouds.com @@ -83,7 +83,7 @@ runs: - name: Clean S3 storage shell: bash env: - BRANCH_NAME: ${{ steps.get_branch.outputs.branch_name }} + BRANCH_NAME: ${{ steps.get-ref-properties.outputs.branch_name }} run: | aws s3 rm --recursive \ s3://fe-alephzero-devnet-eu-central-1-keys-bucket/fe-${{ env.BRANCH_NAME }} diff --git a/.github/actions/get-ref-properties/action.yml b/.github/actions/get-ref-properties/action.yml index 42c87dca68..043f361849 100644 --- a/.github/actions/get-ref-properties/action.yml +++ b/.github/actions/get-ref-properties/action.yml @@ -12,6 +12,9 @@ outputs: branch-name-flattened: description: Branch name with / (slash) replaced with - (hyphen) value: ${{ steps.branch.outputs.name-flattened }} + branch-name-for-argo: + description: Branch name that matches [a-z0-9-.]+ for ArgoCD app name + value: ${{ steps.branch.outputs.name-for-argo }} tag: description: Tag name value: ${{ steps.tag.outputs.name }} @@ -42,6 +45,8 @@ runs: run: | echo name=$(echo ${HEAD_REF#refs/heads/}) >> $GITHUB_OUTPUT echo name-flattened=$(echo ${HEAD_REF#refs/heads/} | tr / -) >> $GITHUB_OUTPUT + echo name-for-argo=$(echo ${HEAD_REF#refs/heads/} \ + | tr / - | tr '[:upper:]' '[:lower:]' | tr -c '[a-z0-9-.]' '-') >> $GITHUB_OUTPUT - name: Get commit properties id: commit diff --git a/.github/workflows/_build-test-node-and-runtime.yml b/.github/workflows/_build-test-node-and-runtime.yml index a664ecffa2..a49f77e843 100644 --- a/.github/workflows/_build-test-node-and-runtime.yml +++ b/.github/workflows/_build-test-node-and-runtime.yml @@ -26,9 +26,8 @@ jobs: - name: Install Rust toolchain uses: actions-rs/toolchain@v1 - - - name: Install WASM target - run: rustup target add wasm32-unknown-unknown + with: + - target: wasm32-unknown-unknown - name: Build test binary and runtime run: | diff --git a/.github/workflows/deploy-feature-envs.yaml b/.github/workflows/deploy-feature-envs.yaml index 1740eb47b5..152c6d1032 100644 --- a/.github/workflows/deploy-feature-envs.yaml +++ b/.github/workflows/deploy-feature-envs.yaml @@ -97,7 +97,7 @@ jobs: - name: Delete old FE when redeploying if: contains( github.event.pull_request.labels.*.name, env.LABEL_DEPLOYED) - uses: ./.github/actions/destroy-feature-environment + uses: ./.github/actions/delete-feature-environment with: gh-ci-token: ${{ secrets.CI_GH_TOKEN }} aws-access-key: ${{ secrets.AWS_DEVNET_ACCESS_KEY_ID }} @@ -497,7 +497,7 @@ jobs: uses: actions/checkout@v3 - name: Delete FE - uses: ./.github/actions/destroy-feature-environment + uses: ./.github/actions/delete-feature-environment id: delete_fe with: gh-ci-token: ${{ secrets.CI_GH_TOKEN }} @@ -558,7 +558,7 @@ jobs: uses: actions/checkout@v3 - name: Delete FE - uses: ./.github/actions/destroy-feature-environment + uses: ./.github/actions/delete-feature-environment id: delete_fe with: gh-ci-token: ${{ secrets.CI_GH_TOKEN }} From 8d40546f5f8063d84abd66d13042dd02f360ac46 Mon Sep 17 00:00:00 2001 From: Marcin Date: Fri, 24 Mar 2023 10:54:14 +0100 Subject: [PATCH 02/40] Now using correct action input args syntax --- .github/workflows/_build-test-node-and-runtime.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/_build-test-node-and-runtime.yml b/.github/workflows/_build-test-node-and-runtime.yml index a49f77e843..2b9ea48a7b 100644 --- a/.github/workflows/_build-test-node-and-runtime.yml +++ b/.github/workflows/_build-test-node-and-runtime.yml @@ -27,7 +27,7 @@ jobs: - name: Install Rust toolchain uses: actions-rs/toolchain@v1 with: - - target: wasm32-unknown-unknown + target: wasm32-unknown-unknown - name: Build test binary and runtime run: | From 08123674f47ca00790dadb88bebbed22dcd2ce19 Mon Sep 17 00:00:00 2001 From: Marcin Date: Fri, 24 Mar 2023 11:04:56 +0100 Subject: [PATCH 03/40] Try different action for installing rust tollchain --- .github/workflows/_build-test-node-and-runtime.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/_build-test-node-and-runtime.yml b/.github/workflows/_build-test-node-and-runtime.yml index 2b9ea48a7b..bbc6308410 100644 --- a/.github/workflows/_build-test-node-and-runtime.yml +++ b/.github/workflows/_build-test-node-and-runtime.yml @@ -25,9 +25,9 @@ jobs: uses: ./.github/actions/get-ref-properties - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@stable with: - target: wasm32-unknown-unknown + targets: wasm32-unknown-unknown - name: Build test binary and runtime run: | From 91479ca342c5fc8a720a31f6b89ef57040910ea8 Mon Sep 17 00:00:00 2001 From: Marcin Date: Fri, 24 Mar 2023 11:07:53 +0100 Subject: [PATCH 04/40] Fix for typo --- .github/actions/delete-feature-environment/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/delete-feature-environment/action.yml b/.github/actions/delete-feature-environment/action.yml index 26704d3abe..6aa7997d16 100644 --- a/.github/actions/delete-feature-environment/action.yml +++ b/.github/actions/delete-feature-environment/action.yml @@ -83,7 +83,7 @@ runs: - name: Clean S3 storage shell: bash env: - BRANCH_NAME: ${{ steps.get-ref-properties.outputs.branch_name }} + BRANCH_NAME: ${{ steps.get-ref-properties.outputs.branch-name-flattened }} run: | aws s3 rm --recursive \ s3://fe-alephzero-devnet-eu-central-1-keys-bucket/fe-${{ env.BRANCH_NAME }} From 05d13196f8aad353810ce378a49af2aef403ca0a Mon Sep 17 00:00:00 2001 From: Marcin Date: Fri, 24 Mar 2023 11:25:09 +0100 Subject: [PATCH 05/40] Try to use custom action for rust toolchain --- .../actions/install-rust-toolchain/action.yml | 16 ++++++++++++++++ .../workflows/_build-test-node-and-runtime.yml | 4 +--- 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 .github/actions/install-rust-toolchain/action.yml diff --git a/.github/actions/install-rust-toolchain/action.yml b/.github/actions/install-rust-toolchain/action.yml new file mode 100644 index 0000000000..6f4a18618e --- /dev/null +++ b/.github/actions/install-rust-toolchain/action.yml @@ -0,0 +1,16 @@ +--- +name: Install rust toolchain +description: | + Reads rust toolchain from rust-toolchain file, installs it with wasm32-unknown-unknown target +runs: + using: composite + steps: + - name: Read rust-toolchain file + uses: andstor/file-reader-action@v1 + with: + path: "rust-toolchain" + - name: Install rust toolchain + shell: bash + run: | + rustup toolchain install --target wasm32-unknown-unknown \ + ${{ steps.read_file.outputs.contents }} diff --git a/.github/workflows/_build-test-node-and-runtime.yml b/.github/workflows/_build-test-node-and-runtime.yml index bbc6308410..a76a7e97c8 100644 --- a/.github/workflows/_build-test-node-and-runtime.yml +++ b/.github/workflows/_build-test-node-and-runtime.yml @@ -25,9 +25,7 @@ jobs: uses: ./.github/actions/get-ref-properties - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@stable - with: - targets: wasm32-unknown-unknown + uses: ./.github/actions/install-rust-toolchain - name: Build test binary and runtime run: | From c3273957ed873f7817536be28a5afe6d5e52f068 Mon Sep 17 00:00:00 2001 From: Marcin Date: Fri, 24 Mar 2023 11:26:44 +0100 Subject: [PATCH 06/40] Try to use custom action for rust toolchain --- .github/actions/install-rust-toolchain/action.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/actions/install-rust-toolchain/action.yml b/.github/actions/install-rust-toolchain/action.yml index 6f4a18618e..728454e374 100644 --- a/.github/actions/install-rust-toolchain/action.yml +++ b/.github/actions/install-rust-toolchain/action.yml @@ -6,6 +6,7 @@ runs: using: composite steps: - name: Read rust-toolchain file + id: read-toolchain-file uses: andstor/file-reader-action@v1 with: path: "rust-toolchain" @@ -13,4 +14,4 @@ runs: shell: bash run: | rustup toolchain install --target wasm32-unknown-unknown \ - ${{ steps.read_file.outputs.contents }} + ${{ steps.read-toolchain-file.outputs.contents }} From 15e461a2ff2522bd17911da55bc401a8e6aea190 Mon Sep 17 00:00:00 2001 From: Marcin Date: Fri, 24 Mar 2023 11:45:40 +0100 Subject: [PATCH 07/40] Try to use custom action for rust toolchain --- .github/actions/install-rust-toolchain/action.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/actions/install-rust-toolchain/action.yml b/.github/actions/install-rust-toolchain/action.yml index 728454e374..9397f405f3 100644 --- a/.github/actions/install-rust-toolchain/action.yml +++ b/.github/actions/install-rust-toolchain/action.yml @@ -10,8 +10,17 @@ runs: uses: andstor/file-reader-action@v1 with: path: "rust-toolchain" + + # This step needs to be extracted either to docker image + - name: Install rustup + shell: bash + run: | + if ! command -v rustup &>/dev/null; then + curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused -fsSL \ + "https://sh.rustup.rs" | sh -s -- --default-toolchain none -y + fi + - name: Install rust toolchain shell: bash run: | - rustup toolchain install --target wasm32-unknown-unknown \ - ${{ steps.read-toolchain-file.outputs.contents }} + rustup toolchain install --target wasm32-unknown-unknown $(cat rust-toolchain) From ab27a4b04215fb53a20a5cf4a61b2fdb89499380 Mon Sep 17 00:00:00 2001 From: Marcin Date: Fri, 24 Mar 2023 11:49:47 +0100 Subject: [PATCH 08/40] Try to use custom action for rust toolchain --- .github/actions/install-rust-toolchain/action.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/actions/install-rust-toolchain/action.yml b/.github/actions/install-rust-toolchain/action.yml index 9397f405f3..e7bac4ad4c 100644 --- a/.github/actions/install-rust-toolchain/action.yml +++ b/.github/actions/install-rust-toolchain/action.yml @@ -5,19 +5,14 @@ description: | runs: using: composite steps: - - name: Read rust-toolchain file - id: read-toolchain-file - uses: andstor/file-reader-action@v1 - with: - path: "rust-toolchain" - - # This step needs to be extracted either to docker image + # This step needs to be extracted either to docker image or to setup of self-hosted runner - name: Install rustup shell: bash run: | if ! command -v rustup &>/dev/null; then curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused -fsSL \ "https://sh.rustup.rs" | sh -s -- --default-toolchain none -y + echo "${CARGO_HOME:-$HOME/.cargo}/bin" >> $GITHUB_PATH fi - name: Install rust toolchain From f9d040a9b8a0fab8e935bb1e31f8a9e74721b6c9 Mon Sep 17 00:00:00 2001 From: Marcin Date: Mon, 27 Mar 2023 09:15:26 +0200 Subject: [PATCH 09/40] Try to use custom action for rust toolchain --- .github/actions/install-rust-toolchain/action.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/actions/install-rust-toolchain/action.yml b/.github/actions/install-rust-toolchain/action.yml index e7bac4ad4c..e6cc4448ae 100644 --- a/.github/actions/install-rust-toolchain/action.yml +++ b/.github/actions/install-rust-toolchain/action.yml @@ -15,7 +15,14 @@ runs: echo "${CARGO_HOME:-$HOME/.cargo}/bin" >> $GITHUB_PATH fi + - name: Read rust toolchain file + id: read-rust-toolchain-file + shell: bash + run: | + toolchain=$(cat rust-toolchain | xargs) + echo "${toolchain}" >> $GITHUB_PATH + - name: Install rust toolchain shell: bash run: | - rustup toolchain install --target wasm32-unknown-unknown $(cat rust-toolchain) + rustup toolchain install ${{ steps.read-rust-toolchain-file.outputs.toolchain }} --target wasm32-unknown-unknown From e75d1b29fd794c6b76f953f7af6cd0b12d68da0e Mon Sep 17 00:00:00 2001 From: Marcin Date: Mon, 27 Mar 2023 09:29:04 +0200 Subject: [PATCH 10/40] Try to use custom action for rust toolchain --- .github/actions/install-rust-toolchain/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/install-rust-toolchain/action.yml b/.github/actions/install-rust-toolchain/action.yml index e6cc4448ae..b90e5ebf89 100644 --- a/.github/actions/install-rust-toolchain/action.yml +++ b/.github/actions/install-rust-toolchain/action.yml @@ -20,7 +20,7 @@ runs: shell: bash run: | toolchain=$(cat rust-toolchain | xargs) - echo "${toolchain}" >> $GITHUB_PATH + echo "toolchain=${toolchain}" >> $GITHUB_OUTPUT - name: Install rust toolchain shell: bash From d15507ec2205b5b2b8206399492223e8906eef95 Mon Sep 17 00:00:00 2001 From: Marcin Date: Mon, 27 Mar 2023 09:29:54 +0200 Subject: [PATCH 11/40] Try to use custom action for rust toolchain --- .github/actions/install-rust-toolchain/action.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/actions/install-rust-toolchain/action.yml b/.github/actions/install-rust-toolchain/action.yml index b90e5ebf89..994f739336 100644 --- a/.github/actions/install-rust-toolchain/action.yml +++ b/.github/actions/install-rust-toolchain/action.yml @@ -25,4 +25,5 @@ runs: - name: Install rust toolchain shell: bash run: | - rustup toolchain install ${{ steps.read-rust-toolchain-file.outputs.toolchain }} --target wasm32-unknown-unknown + rustup toolchain install ${{ steps.read-rust-toolchain-file.outputs.toolchain }} \ + --target wasm32-unknown-unknown From 1436b79ddb3f18a1b8970ba59ae6569f8f76b425 Mon Sep 17 00:00:00 2001 From: Marcin Date: Mon, 27 Mar 2023 10:01:50 +0200 Subject: [PATCH 12/40] Replace all toolchain install with custom action --- .github/workflows/_build-liminal-node.yml | 5 +---- .github/workflows/_build-production-node-and-runtime.yml | 7 ++----- .../workflows/_build-test-node-and-e2e-client-image.yml | 2 +- .github/workflows/_check-excluded-packages.yml | 2 +- .github/workflows/_check-runtime-determimism.yml | 5 +---- .github/workflows/_unit-tests-and-static-checks.yml | 5 +---- .github/workflows/build-and-push-cliain.yml | 2 +- .github/workflows/build-docs.yaml | 2 +- .github/workflows/nightly-pipeline.yaml | 7 ++----- .github/workflows/on-pull-request-commit.yml | 2 +- 10 files changed, 12 insertions(+), 27 deletions(-) diff --git a/.github/workflows/_build-liminal-node.yml b/.github/workflows/_build-liminal-node.yml index 40be13f2c5..37877e4c48 100644 --- a/.github/workflows/_build-liminal-node.yml +++ b/.github/workflows/_build-liminal-node.yml @@ -17,10 +17,7 @@ jobs: uses: actions/checkout@v3 - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 - - - name: Install WASM target - run: rustup target add wasm32-unknown-unknown + uses: ./.github/actions/install-rust-toolchain - name: Build test binary and runtime run: | diff --git a/.github/workflows/_build-production-node-and-runtime.yml b/.github/workflows/_build-production-node-and-runtime.yml index f127f0896a..c7925a6d7a 100644 --- a/.github/workflows/_build-production-node-and-runtime.yml +++ b/.github/workflows/_build-production-node-and-runtime.yml @@ -25,11 +25,8 @@ jobs: uses: ./.github/actions/get-ref-properties - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 - - - name: Install WASM target - run: rustup target add wasm32-unknown-unknown - + uses: ./.github/actions/install-rust-toolchain + - - name: Build production binary and runtime run: cargo build --profile production -p aleph-node diff --git a/.github/workflows/_build-test-node-and-e2e-client-image.yml b/.github/workflows/_build-test-node-and-e2e-client-image.yml index 02ef640e03..ec53bb59e3 100644 --- a/.github/workflows/_build-test-node-and-e2e-client-image.yml +++ b/.github/workflows/_build-test-node-and-e2e-client-image.yml @@ -37,7 +37,7 @@ jobs: retention-days: 7 - name: Install Rust Toolchain - uses: actions-rs/toolchain@v1 + uses: ./.github/actions/install-rust-toolchain - name: Build binary and docker image run: | diff --git a/.github/workflows/_check-excluded-packages.yml b/.github/workflows/_check-excluded-packages.yml index 4b94c6ecd5..bf9a23ab69 100644 --- a/.github/workflows/_check-excluded-packages.yml +++ b/.github/workflows/_check-excluded-packages.yml @@ -16,7 +16,7 @@ jobs: uses: actions/checkout@v3 - name: Install rust toolchain - uses: actions-rs/toolchain@v1 + uses: ./.github/actions/install-rust-toolchain - name: Read excluded packages from Cargo.toml id: read_excluded diff --git a/.github/workflows/_check-runtime-determimism.yml b/.github/workflows/_check-runtime-determimism.yml index 75e95a3857..e628e85754 100644 --- a/.github/workflows/_check-runtime-determimism.yml +++ b/.github/workflows/_check-runtime-determimism.yml @@ -17,10 +17,7 @@ jobs: uses: actions/checkout@v3 - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 - - - name: Install WASM target - run: rustup target add wasm32-unknown-unknown + uses: ./.github/actions/install-rust-toolchain - name: Download production runtime from artifacts uses: actions/download-artifact@v3 diff --git a/.github/workflows/_unit-tests-and-static-checks.yml b/.github/workflows/_unit-tests-and-static-checks.yml index 278d49b9da..185af4c9d6 100644 --- a/.github/workflows/_unit-tests-and-static-checks.yml +++ b/.github/workflows/_unit-tests-and-static-checks.yml @@ -16,14 +16,11 @@ jobs: uses: actions/checkout@v3 - name: Install Rust Toolchain - uses: actions-rs/toolchain@v1 + uses: ./.github/actions/install-rust-toolchain - name: Install clippy and fmt run: rustup component add clippy rustfmt - - name: Install WASM target - run: rustup target add wasm32-unknown-unknown - - name: Run Format Checks uses: actions-rs/cargo@v1 with: diff --git a/.github/workflows/build-and-push-cliain.yml b/.github/workflows/build-and-push-cliain.yml index 7d2d0c1630..f514593037 100644 --- a/.github/workflows/build-and-push-cliain.yml +++ b/.github/workflows/build-and-push-cliain.yml @@ -22,7 +22,7 @@ jobs: uses: actions/checkout@v3 - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 + uses: ./.github/actions/install-rust-toolchain - name: Cargo | Build release binary run: | diff --git a/.github/workflows/build-docs.yaml b/.github/workflows/build-docs.yaml index b5a56d5783..2a97229aa3 100644 --- a/.github/workflows/build-docs.yaml +++ b/.github/workflows/build-docs.yaml @@ -17,7 +17,7 @@ jobs: uses: actions/checkout@v3 - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 + uses: ./.github/actions/install-rust-toolchain - name: rustdoc | Build aleph-client docs run: | diff --git a/.github/workflows/nightly-pipeline.yaml b/.github/workflows/nightly-pipeline.yaml index a3d8fa1807..4e6042ea4b 100644 --- a/.github/workflows/nightly-pipeline.yaml +++ b/.github/workflows/nightly-pipeline.yaml @@ -87,10 +87,7 @@ jobs: uses: actions/checkout@v3 - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 - - - name: Install WASM target - run: rustup target add wasm32-unknown-unknown + uses: ./.github/actions/install-rust-toolchain - name: Download artifact uses: actions/download-artifact@v2 @@ -120,7 +117,7 @@ jobs: uses: actions/checkout@v3 - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 + uses: ./.github/actions/install-rust-toolchain - name: Build binary and docker image run: | diff --git a/.github/workflows/on-pull-request-commit.yml b/.github/workflows/on-pull-request-commit.yml index 8678716297..0f4c2d0236 100644 --- a/.github/workflows/on-pull-request-commit.yml +++ b/.github/workflows/on-pull-request-commit.yml @@ -401,7 +401,7 @@ jobs: uses: actions/checkout@v3 - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 + uses: ./.github/actions/install-rust-toolchain - name: Install rust-src working-directory: ./contracts From 630dbafbe6a583ba63214a9972f78587471cb1e4 Mon Sep 17 00:00:00 2001 From: Marcin Date: Mon, 27 Mar 2023 12:39:36 +0200 Subject: [PATCH 13/40] New action has now components and toolchain inputs --- .../actions/install-rust-toolchain/action.yml | 31 +++++++++++++++++-- .github/workflows/_build-liminal-node.yml | 2 ++ .../_build-production-node-and-runtime.yml | 2 +- .../_build-test-node-and-runtime.yml | 2 ++ .../workflows/_check-runtime-determimism.yml | 4 ++- .../_unit-tests-and-static-checks.yml | 3 ++ .github/workflows/nightly-pipeline.yaml | 2 ++ .github/workflows/on-pull-request-commit.yml | 8 +++-- 8 files changed, 46 insertions(+), 8 deletions(-) diff --git a/.github/actions/install-rust-toolchain/action.yml b/.github/actions/install-rust-toolchain/action.yml index 994f739336..0f6ae93ada 100644 --- a/.github/actions/install-rust-toolchain/action.yml +++ b/.github/actions/install-rust-toolchain/action.yml @@ -1,7 +1,15 @@ --- name: Install rust toolchain description: | - Reads rust toolchain from rust-toolchain file, installs it with wasm32-unknown-unknown target + Reads rust toolchain from rust-toolchain file and installs it. Optionally add given target. +inputs: + target: + description: Optional cargo target to install + required: false + components: + description: Optional list of cargo components to install + required: false + runs: using: composite steps: @@ -19,11 +27,28 @@ runs: id: read-rust-toolchain-file shell: bash run: | + if [[ ! -f rust-toolchain ]]; then + echo "rust-toolchain file does not exist in root of the repo!" + exit 1 + fi toolchain=$(cat rust-toolchain | xargs) echo "toolchain=${toolchain}" >> $GITHUB_OUTPUT - name: Install rust toolchain shell: bash run: | - rustup toolchain install ${{ steps.read-rust-toolchain-file.outputs.toolchain }} \ - --target wasm32-unknown-unknown + rustup toolchain install ${{ steps.read-rust-toolchain-file.outputs.toolchain }} + + - name: Add target (optional) + if: inputs.toolchain != '' + shell: bash + run: | + rustup target add wasm32-unknown-unknown \ + --toolchain ${{ steps.read-rust-toolchain-file.outputs.toolchain }} + + - name: Add components (optional) + if: inputs.components != '' + shell: bash + run: | + rustup components add "${{ inputs.components }} + diff --git a/.github/workflows/_build-liminal-node.yml b/.github/workflows/_build-liminal-node.yml index 37877e4c48..1c61cb9754 100644 --- a/.github/workflows/_build-liminal-node.yml +++ b/.github/workflows/_build-liminal-node.yml @@ -18,6 +18,8 @@ jobs: - name: Install Rust toolchain uses: ./.github/actions/install-rust-toolchain + with: + toolchain: wasm32-unknown-unknown - name: Build test binary and runtime run: | diff --git a/.github/workflows/_build-production-node-and-runtime.yml b/.github/workflows/_build-production-node-and-runtime.yml index c7925a6d7a..d83a3ace20 100644 --- a/.github/workflows/_build-production-node-and-runtime.yml +++ b/.github/workflows/_build-production-node-and-runtime.yml @@ -26,7 +26,7 @@ jobs: - name: Install Rust toolchain uses: ./.github/actions/install-rust-toolchain - - + - name: Build production binary and runtime run: cargo build --profile production -p aleph-node diff --git a/.github/workflows/_build-test-node-and-runtime.yml b/.github/workflows/_build-test-node-and-runtime.yml index a76a7e97c8..9801bab23f 100644 --- a/.github/workflows/_build-test-node-and-runtime.yml +++ b/.github/workflows/_build-test-node-and-runtime.yml @@ -26,6 +26,8 @@ jobs: - name: Install Rust toolchain uses: ./.github/actions/install-rust-toolchain + with: + toolchain: wasm32-unknown-unknown - name: Build test binary and runtime run: | diff --git a/.github/workflows/_check-runtime-determimism.yml b/.github/workflows/_check-runtime-determimism.yml index e628e85754..0f6d9c4c99 100644 --- a/.github/workflows/_check-runtime-determimism.yml +++ b/.github/workflows/_check-runtime-determimism.yml @@ -7,7 +7,7 @@ on: jobs: main: - name: Verify runtime build determinism + name: Check runtime build determinism runs-on: self-hosted env: RUST_BACKTRACE: full @@ -18,6 +18,8 @@ jobs: - name: Install Rust toolchain uses: ./.github/actions/install-rust-toolchain + with: + toolchain: wasm32-unknown-unknown - name: Download production runtime from artifacts uses: actions/download-artifact@v3 diff --git a/.github/workflows/_unit-tests-and-static-checks.yml b/.github/workflows/_unit-tests-and-static-checks.yml index 185af4c9d6..a3bd57c07d 100644 --- a/.github/workflows/_unit-tests-and-static-checks.yml +++ b/.github/workflows/_unit-tests-and-static-checks.yml @@ -17,6 +17,9 @@ jobs: - name: Install Rust Toolchain uses: ./.github/actions/install-rust-toolchain + with: + toolchain: wasm32-unknown-unknown + components: clippy rustfmt - name: Install clippy and fmt run: rustup component add clippy rustfmt diff --git a/.github/workflows/nightly-pipeline.yaml b/.github/workflows/nightly-pipeline.yaml index 4e6042ea4b..4c092667f2 100644 --- a/.github/workflows/nightly-pipeline.yaml +++ b/.github/workflows/nightly-pipeline.yaml @@ -88,6 +88,7 @@ jobs: - name: Install Rust toolchain uses: ./.github/actions/install-rust-toolchain + toolchain: wasm32-unknown-unknown - name: Download artifact uses: actions/download-artifact@v2 @@ -118,6 +119,7 @@ jobs: - name: Install Rust toolchain uses: ./.github/actions/install-rust-toolchain + toolchain: wasm32-unknown-unknown - name: Build binary and docker image run: | diff --git a/.github/workflows/on-pull-request-commit.yml b/.github/workflows/on-pull-request-commit.yml index 0f4c2d0236..0e4ac4cfd7 100644 --- a/.github/workflows/on-pull-request-commit.yml +++ b/.github/workflows/on-pull-request-commit.yml @@ -402,10 +402,12 @@ jobs: - name: Install Rust toolchain uses: ./.github/actions/install-rust-toolchain + toolchain: wasm32-unknown-unknown + components: rust-src - - name: Install rust-src - working-directory: ./contracts - run: rustup component add rust-src +# - name: Install rust-src +# working-directory: ./contracts +# run: rustup component add rust-src - name: Run e2e test uses: ./.github/actions/run-e2e-test From bdc5566498adce2807c126aa0f41b276af628568 Mon Sep 17 00:00:00 2001 From: Marcin Date: Mon, 27 Mar 2023 12:41:08 +0200 Subject: [PATCH 14/40] linter --- .github/workflows/nightly-pipeline.yaml | 2 ++ .github/workflows/on-pull-request-commit.yml | 1 + 2 files changed, 3 insertions(+) diff --git a/.github/workflows/nightly-pipeline.yaml b/.github/workflows/nightly-pipeline.yaml index 4c092667f2..e03a289d76 100644 --- a/.github/workflows/nightly-pipeline.yaml +++ b/.github/workflows/nightly-pipeline.yaml @@ -88,6 +88,7 @@ jobs: - name: Install Rust toolchain uses: ./.github/actions/install-rust-toolchain + with: toolchain: wasm32-unknown-unknown - name: Download artifact @@ -119,6 +120,7 @@ jobs: - name: Install Rust toolchain uses: ./.github/actions/install-rust-toolchain + with: toolchain: wasm32-unknown-unknown - name: Build binary and docker image diff --git a/.github/workflows/on-pull-request-commit.yml b/.github/workflows/on-pull-request-commit.yml index 0e4ac4cfd7..cc25ba6adc 100644 --- a/.github/workflows/on-pull-request-commit.yml +++ b/.github/workflows/on-pull-request-commit.yml @@ -402,6 +402,7 @@ jobs: - name: Install Rust toolchain uses: ./.github/actions/install-rust-toolchain + with: toolchain: wasm32-unknown-unknown components: rust-src From 0f6ab9e4a196b9fb4e28b8d0fb6f0a6a636f8cbf Mon Sep 17 00:00:00 2001 From: Marcin Date: Mon, 27 Mar 2023 12:43:23 +0200 Subject: [PATCH 15/40] linter --- .github/workflows/_build-liminal-node.yml | 2 +- .github/workflows/_build-test-node-and-runtime.yml | 2 +- .github/workflows/_check-runtime-determimism.yml | 2 +- .github/workflows/_unit-tests-and-static-checks.yml | 2 +- .github/workflows/nightly-pipeline.yaml | 4 ++-- .github/workflows/on-pull-request-commit.yml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/_build-liminal-node.yml b/.github/workflows/_build-liminal-node.yml index 1c61cb9754..0f75ae3562 100644 --- a/.github/workflows/_build-liminal-node.yml +++ b/.github/workflows/_build-liminal-node.yml @@ -19,7 +19,7 @@ jobs: - name: Install Rust toolchain uses: ./.github/actions/install-rust-toolchain with: - toolchain: wasm32-unknown-unknown + target: wasm32-unknown-unknown - name: Build test binary and runtime run: | diff --git a/.github/workflows/_build-test-node-and-runtime.yml b/.github/workflows/_build-test-node-and-runtime.yml index 9801bab23f..3f2ae49883 100644 --- a/.github/workflows/_build-test-node-and-runtime.yml +++ b/.github/workflows/_build-test-node-and-runtime.yml @@ -27,7 +27,7 @@ jobs: - name: Install Rust toolchain uses: ./.github/actions/install-rust-toolchain with: - toolchain: wasm32-unknown-unknown + target: wasm32-unknown-unknown - name: Build test binary and runtime run: | diff --git a/.github/workflows/_check-runtime-determimism.yml b/.github/workflows/_check-runtime-determimism.yml index 0f6d9c4c99..0f24a69432 100644 --- a/.github/workflows/_check-runtime-determimism.yml +++ b/.github/workflows/_check-runtime-determimism.yml @@ -19,7 +19,7 @@ jobs: - name: Install Rust toolchain uses: ./.github/actions/install-rust-toolchain with: - toolchain: wasm32-unknown-unknown + target: wasm32-unknown-unknown - name: Download production runtime from artifacts uses: actions/download-artifact@v3 diff --git a/.github/workflows/_unit-tests-and-static-checks.yml b/.github/workflows/_unit-tests-and-static-checks.yml index a3bd57c07d..a7f6c11cf3 100644 --- a/.github/workflows/_unit-tests-and-static-checks.yml +++ b/.github/workflows/_unit-tests-and-static-checks.yml @@ -18,7 +18,7 @@ jobs: - name: Install Rust Toolchain uses: ./.github/actions/install-rust-toolchain with: - toolchain: wasm32-unknown-unknown + target: wasm32-unknown-unknown components: clippy rustfmt - name: Install clippy and fmt diff --git a/.github/workflows/nightly-pipeline.yaml b/.github/workflows/nightly-pipeline.yaml index e03a289d76..438c6be30c 100644 --- a/.github/workflows/nightly-pipeline.yaml +++ b/.github/workflows/nightly-pipeline.yaml @@ -89,7 +89,7 @@ jobs: - name: Install Rust toolchain uses: ./.github/actions/install-rust-toolchain with: - toolchain: wasm32-unknown-unknown + target: wasm32-unknown-unknown - name: Download artifact uses: actions/download-artifact@v2 @@ -121,7 +121,7 @@ jobs: - name: Install Rust toolchain uses: ./.github/actions/install-rust-toolchain with: - toolchain: wasm32-unknown-unknown + target: wasm32-unknown-unknown - name: Build binary and docker image run: | diff --git a/.github/workflows/on-pull-request-commit.yml b/.github/workflows/on-pull-request-commit.yml index cc25ba6adc..81a6c7f6e2 100644 --- a/.github/workflows/on-pull-request-commit.yml +++ b/.github/workflows/on-pull-request-commit.yml @@ -403,7 +403,7 @@ jobs: - name: Install Rust toolchain uses: ./.github/actions/install-rust-toolchain with: - toolchain: wasm32-unknown-unknown + target: wasm32-unknown-unknown components: rust-src # - name: Install rust-src From 569fbb5e6771fa6ea3d88a513e1b14f228288b63 Mon Sep 17 00:00:00 2001 From: Marcin Date: Mon, 27 Mar 2023 12:45:29 +0200 Subject: [PATCH 16/40] Missing " --- .github/actions/install-rust-toolchain/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/install-rust-toolchain/action.yml b/.github/actions/install-rust-toolchain/action.yml index 0f6ae93ada..5997b500bd 100644 --- a/.github/actions/install-rust-toolchain/action.yml +++ b/.github/actions/install-rust-toolchain/action.yml @@ -50,5 +50,5 @@ runs: if: inputs.components != '' shell: bash run: | - rustup components add "${{ inputs.components }} + rustup components add "${{ inputs.components }}" From 370737dc47ac98907af6f57450e32833407340fc Mon Sep 17 00:00:00 2001 From: Marcin Date: Mon, 27 Mar 2023 12:48:06 +0200 Subject: [PATCH 17/40] Typo --- .github/actions/install-rust-toolchain/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/install-rust-toolchain/action.yml b/.github/actions/install-rust-toolchain/action.yml index 5997b500bd..cad971c1c8 100644 --- a/.github/actions/install-rust-toolchain/action.yml +++ b/.github/actions/install-rust-toolchain/action.yml @@ -50,5 +50,5 @@ runs: if: inputs.components != '' shell: bash run: | - rustup components add "${{ inputs.components }}" + rustup component add "${{ inputs.components }}" From 7dfb8ab5325c4aa616ef8da3a6f788778a3aa302 Mon Sep 17 00:00:00 2001 From: Marcin Date: Mon, 27 Mar 2023 12:51:27 +0200 Subject: [PATCH 18/40] Typo --- .github/actions/install-rust-toolchain/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/install-rust-toolchain/action.yml b/.github/actions/install-rust-toolchain/action.yml index cad971c1c8..5658516fc6 100644 --- a/.github/actions/install-rust-toolchain/action.yml +++ b/.github/actions/install-rust-toolchain/action.yml @@ -40,7 +40,7 @@ runs: rustup toolchain install ${{ steps.read-rust-toolchain-file.outputs.toolchain }} - name: Add target (optional) - if: inputs.toolchain != '' + if: inputs.target != '' shell: bash run: | rustup target add wasm32-unknown-unknown \ From f96e2fc1abe293be2d3fc3e917a43d742386e863 Mon Sep 17 00:00:00 2001 From: Marcin Date: Mon, 27 Mar 2023 12:56:17 +0200 Subject: [PATCH 19/40] Switch order of steps --- .github/actions/install-rust-toolchain/action.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/actions/install-rust-toolchain/action.yml b/.github/actions/install-rust-toolchain/action.yml index 5658516fc6..723d06c6a4 100644 --- a/.github/actions/install-rust-toolchain/action.yml +++ b/.github/actions/install-rust-toolchain/action.yml @@ -39,6 +39,12 @@ runs: run: | rustup toolchain install ${{ steps.read-rust-toolchain-file.outputs.toolchain }} + - name: Add components (optional) + if: inputs.components != '' + shell: bash + run: | + rustup component add "${{ inputs.components }}" + - name: Add target (optional) if: inputs.target != '' shell: bash @@ -46,9 +52,4 @@ runs: rustup target add wasm32-unknown-unknown \ --toolchain ${{ steps.read-rust-toolchain-file.outputs.toolchain }} - - name: Add components (optional) - if: inputs.components != '' - shell: bash - run: | - rustup component add "${{ inputs.components }}" From 4acdc6e0831b078c444676de9b5461d310a52d74 Mon Sep 17 00:00:00 2001 From: Marcin Date: Mon, 27 Mar 2023 12:58:52 +0200 Subject: [PATCH 20/40] No --- .github/actions/install-rust-toolchain/action.yml | 4 +--- .github/workflows/_build-production-node-and-runtime.yml | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/install-rust-toolchain/action.yml b/.github/actions/install-rust-toolchain/action.yml index 723d06c6a4..fa09608f75 100644 --- a/.github/actions/install-rust-toolchain/action.yml +++ b/.github/actions/install-rust-toolchain/action.yml @@ -43,7 +43,7 @@ runs: if: inputs.components != '' shell: bash run: | - rustup component add "${{ inputs.components }}" + rustup component add ${{ inputs.components }} - name: Add target (optional) if: inputs.target != '' @@ -51,5 +51,3 @@ runs: run: | rustup target add wasm32-unknown-unknown \ --toolchain ${{ steps.read-rust-toolchain-file.outputs.toolchain }} - - diff --git a/.github/workflows/_build-production-node-and-runtime.yml b/.github/workflows/_build-production-node-and-runtime.yml index d83a3ace20..df03f37955 100644 --- a/.github/workflows/_build-production-node-and-runtime.yml +++ b/.github/workflows/_build-production-node-and-runtime.yml @@ -26,6 +26,8 @@ jobs: - name: Install Rust toolchain uses: ./.github/actions/install-rust-toolchain + with: + target: wasm32-unknown-unknown - name: Build production binary and runtime run: cargo build --profile production -p aleph-node From b30bacb8a59bd0705f3a415e9fbeb8e1bf4521fb Mon Sep 17 00:00:00 2001 From: Marcin Date: Mon, 27 Mar 2023 13:20:38 +0200 Subject: [PATCH 21/40] Check excluded packages cleanup --- .github/workflows/_check-excluded-packages.yml | 8 +++----- .github/workflows/_unit-tests-and-static-checks.yml | 3 --- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/_check-excluded-packages.yml b/.github/workflows/_check-excluded-packages.yml index bf9a23ab69..4c3a636ad6 100644 --- a/.github/workflows/_check-excluded-packages.yml +++ b/.github/workflows/_check-excluded-packages.yml @@ -17,6 +17,9 @@ jobs: - name: Install rust toolchain uses: ./.github/actions/install-rust-toolchain + with: + target: wasm32-unknown-unknown + components: clippy rust - name: Read excluded packages from Cargo.toml id: read_excluded @@ -39,9 +42,6 @@ jobs: echo "targets=$targets" >> $GITHUB_OUTPUT - name: Check excluded packages - env: - RUSTC_WRAPPER: "" - RUSTC_WORKSPACE_WRAPPER: sccache run: | packages="${{ steps.format_output.outputs.packages }}" packages="${packages//'%0A'/$'\n'}" @@ -54,8 +54,6 @@ jobs: fi echo "Checking package $p..." pushd "$p" - rustup component add clippy rustfmt - rustup target add wasm32-unknown-unknown cargo fmt --all --check cargo clippy -- --no-deps -D warnings popd diff --git a/.github/workflows/_unit-tests-and-static-checks.yml b/.github/workflows/_unit-tests-and-static-checks.yml index a7f6c11cf3..a7d6542c42 100644 --- a/.github/workflows/_unit-tests-and-static-checks.yml +++ b/.github/workflows/_unit-tests-and-static-checks.yml @@ -21,9 +21,6 @@ jobs: target: wasm32-unknown-unknown components: clippy rustfmt - - name: Install clippy and fmt - run: rustup component add clippy rustfmt - - name: Run Format Checks uses: actions-rs/cargo@v1 with: From b6ef0235dc68ea72aaebb0c926fef73861aef447 Mon Sep 17 00:00:00 2001 From: Marcin Date: Mon, 27 Mar 2023 13:23:14 +0200 Subject: [PATCH 22/40] Check excluded packages cleanup --- .github/workflows/_check-excluded-packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/_check-excluded-packages.yml b/.github/workflows/_check-excluded-packages.yml index 4c3a636ad6..941e9a8233 100644 --- a/.github/workflows/_check-excluded-packages.yml +++ b/.github/workflows/_check-excluded-packages.yml @@ -19,7 +19,7 @@ jobs: uses: ./.github/actions/install-rust-toolchain with: target: wasm32-unknown-unknown - components: clippy rust + components: clippy rustfmt - name: Read excluded packages from Cargo.toml id: read_excluded From e71be565c3657a7b944e5c49af4be777acbfca1e Mon Sep 17 00:00:00 2001 From: Marcin Date: Mon, 27 Mar 2023 14:17:33 +0200 Subject: [PATCH 23/40] Removed comment code --- .github/workflows/on-pull-request-commit.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/on-pull-request-commit.yml b/.github/workflows/on-pull-request-commit.yml index 81a6c7f6e2..7c9ea89845 100644 --- a/.github/workflows/on-pull-request-commit.yml +++ b/.github/workflows/on-pull-request-commit.yml @@ -406,10 +406,6 @@ jobs: target: wasm32-unknown-unknown components: rust-src -# - name: Install rust-src -# working-directory: ./contracts -# run: rustup component add rust-src - - name: Run e2e test uses: ./.github/actions/run-e2e-test with: From af3b021e9529dfd1d21931958439796f75f2fe66 Mon Sep 17 00:00:00 2001 From: Marcin Date: Mon, 27 Mar 2023 21:20:13 +0200 Subject: [PATCH 24/40] Rust-toolchain file is now toml --- .../actions/install-rust-toolchain/action.yml | 27 +++++++++++++++---- ...d-production-node-and-e2e-client-image.yml | 4 +-- BUILD.md | 2 +- nix/versions.nix | 4 +-- rust-toolchain | 1 - rust-toolchain.toml | 2 ++ 6 files changed, 29 insertions(+), 11 deletions(-) delete mode 100644 rust-toolchain create mode 100644 rust-toolchain.toml diff --git a/.github/actions/install-rust-toolchain/action.yml b/.github/actions/install-rust-toolchain/action.yml index fa09608f75..7a49825908 100644 --- a/.github/actions/install-rust-toolchain/action.yml +++ b/.github/actions/install-rust-toolchain/action.yml @@ -23,21 +23,38 @@ runs: echo "${CARGO_HOME:-$HOME/.cargo}/bin" >> $GITHUB_PATH fi + - name: Read channel from rust-toolchain.toml + id: toolchain-channel + uses: SebRollen/toml-action@v1.0.2 + with: + file: 'rust-toolchain.toml' + field: 'toolchain.channel' + + - name: Read components from rust-toolchain.toml + id: toolchain-components + uses: SebRollen/toml-action@v1.0.2 + with: + file: 'rust-toolchain.toml' + field: 'toolchain.components' + + - name: Read targets from rust-toolchain.toml + id: toolchain-targets + uses: SebRollen/toml-action@v1.0.2 + with: + file: 'rust-toolchain.toml' + field: 'toolchain.targets' + - name: Read rust toolchain file id: read-rust-toolchain-file shell: bash run: | - if [[ ! -f rust-toolchain ]]; then - echo "rust-toolchain file does not exist in root of the repo!" - exit 1 - fi toolchain=$(cat rust-toolchain | xargs) echo "toolchain=${toolchain}" >> $GITHUB_OUTPUT - name: Install rust toolchain shell: bash run: | - rustup toolchain install ${{ steps.read-rust-toolchain-file.outputs.toolchain }} + rustup toolchain install ${{ steps.toolchain-channel.outputs.channel }} - name: Add components (optional) if: inputs.components != '' diff --git a/.github/workflows/_build-production-node-and-e2e-client-image.yml b/.github/workflows/_build-production-node-and-e2e-client-image.yml index 95179c949e..c9195e4a84 100644 --- a/.github/workflows/_build-production-node-and-e2e-client-image.yml +++ b/.github/workflows/_build-production-node-and-e2e-client-image.yml @@ -41,8 +41,8 @@ jobs: if-no-files-found: error retention-days: 7 - - name: Install Rust Toolchain - uses: actions-rs/toolchain@v1 + - name: Install Rust toolchain + uses: ./.github/actions/install-rust-toolchain - name: Build binary and docker image run: | diff --git a/BUILD.md b/BUILD.md index 1356f56dd5..65ec213b19 100644 --- a/BUILD.md +++ b/BUILD.md @@ -101,4 +101,4 @@ cargo build --release [nix]: https://nixos.org/download.html [rustup]: https://rustup.rs/ [docker]: https://docs.docker.com/engine/install/ubuntu/ -[rust-toolchain]: ./rust-toolchain +[rust-toolchain]: ./rust-toolchain.toml diff --git a/nix/versions.nix b/nix/versions.nix index ccf2d4fa99..93477c4a6d 100644 --- a/nix/versions.nix +++ b/nix/versions.nix @@ -2,7 +2,7 @@ rec { rustToolchain = let - # use Rust toolchain declared by the rust-toolchain file + # use Rust toolchain declared by the rust-toolchain.toml file rustToolchain = with nixpkgs; overrideRustTarget ( rustChannelOf { date = "2022-10-30"; channel = "nightly"; } ); overrideRustTarget = rustChannel: rustChannel // { @@ -15,7 +15,7 @@ rec { nixpkgs = let - # this overlay allows us to use a version of the rust toolchain specified by the rust-toolchain file + # this overlay allows us to use a version of the rust toolchain specified by the rust-toolchain.toml file rustOverlay = import (builtins.fetchTarball { # link: https://github.com/mozilla/nixpkgs-mozilla/tree/f233fdc4ff6ba2ffeb1e3e3cd6d63bb1297d6996 diff --git a/rust-toolchain b/rust-toolchain deleted file mode 100644 index 06f480baab..0000000000 --- a/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -nightly-2022-10-30 diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000000..8dc85561f7 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,2 @@ +[toolchain] +channel = "nightly-2022-10-30" From 74c7ce83b313a23674ae1f4992b7f9c1bca4874e Mon Sep 17 00:00:00 2001 From: Marcin Date: Mon, 27 Mar 2023 21:21:36 +0200 Subject: [PATCH 25/40] Rust-toolchain file is now toml --- .github/actions/install-rust-toolchain/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/install-rust-toolchain/action.yml b/.github/actions/install-rust-toolchain/action.yml index 7a49825908..1cf778bdb3 100644 --- a/.github/actions/install-rust-toolchain/action.yml +++ b/.github/actions/install-rust-toolchain/action.yml @@ -54,7 +54,7 @@ runs: - name: Install rust toolchain shell: bash run: | - rustup toolchain install ${{ steps.toolchain-channel.outputs.channel }} + rustup toolchain install ${{ steps.toolchain-channel.outputs.value }} - name: Add components (optional) if: inputs.components != '' From 96eb338e98401306e3e403090635fedd3813115d Mon Sep 17 00:00:00 2001 From: Marcin Date: Mon, 27 Mar 2023 21:41:01 +0200 Subject: [PATCH 26/40] Rust-toolchain file is now toml --- .../actions/install-rust-toolchain/action.yml | 35 +++++++++++-------- rust-toolchain.toml | 1 + 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/.github/actions/install-rust-toolchain/action.yml b/.github/actions/install-rust-toolchain/action.yml index 1cf778bdb3..ecc6b1f04d 100644 --- a/.github/actions/install-rust-toolchain/action.yml +++ b/.github/actions/install-rust-toolchain/action.yml @@ -44,27 +44,34 @@ runs: file: 'rust-toolchain.toml' field: 'toolchain.targets' - - name: Read rust toolchain file - id: read-rust-toolchain-file - shell: bash - run: | - toolchain=$(cat rust-toolchain | xargs) - echo "toolchain=${toolchain}" >> $GITHUB_OUTPUT - - name: Install rust toolchain + id: install-rust-toolchain shell: bash + env: + CHANNEL: ${{ inputs.channel || steps.toolchain-channel.outputs.value }} run: | - rustup toolchain install ${{ steps.toolchain-channel.outputs.value }} + if [[ -z "${{ steps.toolchain-channel.outputs.value }}" ]]; then + echo "Could not find value for toolchain.channel in rust-toolchain.toml!" + exit 1 + fi + rustup toolchain install ${{ env.CHANNEL }} + echo "channel=${{ env.CHANNEL }}" >> $GITHUB_OUTPUT - name: Add components (optional) - if: inputs.components != '' + if: inputs.components != '' || steps.toolchain-components.outputs.value != '' shell: bash + env: + COMPONENTS: ${{ inputs.components || steps.toolchain-components.outputs.value }} run: | - rustup component add ${{ inputs.components }} + rustup component add ${{ env.COMPONENTS }} - - name: Add target (optional) - if: inputs.target != '' + - name: Add targets (optional) + if: inputs.target != '' || steps.toolchain-targets.outputs.value != '' shell: bash + env: + TARGETS: ${{ inputs.targets || steps.toolchain-targets.outputs.value }} run: | - rustup target add wasm32-unknown-unknown \ - --toolchain ${{ steps.read-rust-toolchain-file.outputs.toolchain }} + for target in ${{ env.TARGETS }}; do + rustup target add "${target}" \ + --toolchain ${{ steps.install-rust-toolchain.outputs.channel }} + done diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 8dc85561f7..786322085e 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,3 @@ [toolchain] channel = "nightly-2022-10-30" +targets = ["wasm32-unknown-unknown"] From 7b9bdc79e5751e4bf45aeb855cf41b107301a4ff Mon Sep 17 00:00:00 2001 From: Marcin Date: Mon, 27 Mar 2023 21:53:16 +0200 Subject: [PATCH 27/40] Rust-toolchain file is now toml --- .github/actions/install-rust-toolchain/action.yml | 8 +++++--- .github/workflows/_build-liminal-node.yml | 2 +- .github/workflows/_build-production-node-and-runtime.yml | 2 +- .github/workflows/_build-test-node-and-runtime.yml | 4 ++-- .github/workflows/_check-excluded-packages.yml | 2 +- .github/workflows/_check-runtime-determimism.yml | 2 +- .github/workflows/_unit-tests-and-static-checks.yml | 2 +- .github/workflows/on-pull-request-commit.yml | 2 +- rust-toolchain.toml | 2 +- 9 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/actions/install-rust-toolchain/action.yml b/.github/actions/install-rust-toolchain/action.yml index ecc6b1f04d..09e26922b5 100644 --- a/.github/actions/install-rust-toolchain/action.yml +++ b/.github/actions/install-rust-toolchain/action.yml @@ -3,7 +3,7 @@ name: Install rust toolchain description: | Reads rust toolchain from rust-toolchain file and installs it. Optionally add given target. inputs: - target: + targets: description: Optional cargo target to install required: false components: @@ -63,7 +63,8 @@ runs: env: COMPONENTS: ${{ inputs.components || steps.toolchain-components.outputs.value }} run: | - rustup component add ${{ env.COMPONENTS }} + components=$(echo ${{ env.COMPONENTS }} | tr -d '[]' | sed 's/,/ /g') + rustup component add $components - name: Add targets (optional) if: inputs.target != '' || steps.toolchain-targets.outputs.value != '' @@ -71,7 +72,8 @@ runs: env: TARGETS: ${{ inputs.targets || steps.toolchain-targets.outputs.value }} run: | + targets=$(echo ${{ env.TARGETS }} | tr -d '[]' | sed 's/,/ /g') for target in ${{ env.TARGETS }}; do - rustup target add "${target}" \ + rustup target add ${target} \ --toolchain ${{ steps.install-rust-toolchain.outputs.channel }} done diff --git a/.github/workflows/_build-liminal-node.yml b/.github/workflows/_build-liminal-node.yml index 0f75ae3562..1242734695 100644 --- a/.github/workflows/_build-liminal-node.yml +++ b/.github/workflows/_build-liminal-node.yml @@ -19,7 +19,7 @@ jobs: - name: Install Rust toolchain uses: ./.github/actions/install-rust-toolchain with: - target: wasm32-unknown-unknown + targets: wasm32-unknown-unknown - name: Build test binary and runtime run: | diff --git a/.github/workflows/_build-production-node-and-runtime.yml b/.github/workflows/_build-production-node-and-runtime.yml index f3779106eb..3772d3cb0e 100644 --- a/.github/workflows/_build-production-node-and-runtime.yml +++ b/.github/workflows/_build-production-node-and-runtime.yml @@ -27,7 +27,7 @@ jobs: - name: Install Rust toolchain uses: ./.github/actions/install-rust-toolchain with: - target: wasm32-unknown-unknown + targets: wasm32-unknown-unknown - name: Build production binary and runtime run: cargo build --profile production -p aleph-node diff --git a/.github/workflows/_build-test-node-and-runtime.yml b/.github/workflows/_build-test-node-and-runtime.yml index f16f0c9b8b..1388942fa7 100644 --- a/.github/workflows/_build-test-node-and-runtime.yml +++ b/.github/workflows/_build-test-node-and-runtime.yml @@ -8,7 +8,7 @@ on: jobs: main: name: Build test node and runtime - runs-on: self-hosted + runs-on: ubuntu-20.04 env: RUST_BACKTRACE: full RUSTC_WRAPPER: sccache @@ -27,7 +27,7 @@ jobs: - name: Install Rust toolchain uses: ./.github/actions/install-rust-toolchain with: - target: wasm32-unknown-unknown + targets: wasm32-unknown-unknown - name: Build test binary and runtime run: | diff --git a/.github/workflows/_check-excluded-packages.yml b/.github/workflows/_check-excluded-packages.yml index eb09f3b7ef..a41ee5469b 100644 --- a/.github/workflows/_check-excluded-packages.yml +++ b/.github/workflows/_check-excluded-packages.yml @@ -18,7 +18,7 @@ jobs: - name: Install rust toolchain uses: ./.github/actions/install-rust-toolchain with: - target: wasm32-unknown-unknown + targets: wasm32-unknown-unknown components: clippy rustfmt - name: Read excluded packages from Cargo.toml diff --git a/.github/workflows/_check-runtime-determimism.yml b/.github/workflows/_check-runtime-determimism.yml index 0f24a69432..bda8bb30c1 100644 --- a/.github/workflows/_check-runtime-determimism.yml +++ b/.github/workflows/_check-runtime-determimism.yml @@ -19,7 +19,7 @@ jobs: - name: Install Rust toolchain uses: ./.github/actions/install-rust-toolchain with: - target: wasm32-unknown-unknown + targets: wasm32-unknown-unknown - name: Download production runtime from artifacts uses: actions/download-artifact@v3 diff --git a/.github/workflows/_unit-tests-and-static-checks.yml b/.github/workflows/_unit-tests-and-static-checks.yml index a7d6542c42..f86c89b56f 100644 --- a/.github/workflows/_unit-tests-and-static-checks.yml +++ b/.github/workflows/_unit-tests-and-static-checks.yml @@ -18,7 +18,7 @@ jobs: - name: Install Rust Toolchain uses: ./.github/actions/install-rust-toolchain with: - target: wasm32-unknown-unknown + targets: wasm32-unknown-unknown components: clippy rustfmt - name: Run Format Checks diff --git a/.github/workflows/on-pull-request-commit.yml b/.github/workflows/on-pull-request-commit.yml index 7c9ea89845..03e1977a2a 100644 --- a/.github/workflows/on-pull-request-commit.yml +++ b/.github/workflows/on-pull-request-commit.yml @@ -403,7 +403,7 @@ jobs: - name: Install Rust toolchain uses: ./.github/actions/install-rust-toolchain with: - target: wasm32-unknown-unknown + targets: wasm32-unknown-unknown components: rust-src - name: Run e2e test diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 786322085e..61081d4a8b 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] channel = "nightly-2022-10-30" -targets = ["wasm32-unknown-unknown"] +targets = ["wasm32-unknown-unknown", "wasm32-unknown-unknown"] From 6603a975f63bde1e094b9169f002ffcc3a044040 Mon Sep 17 00:00:00 2001 From: Marcin Date: Mon, 27 Mar 2023 21:55:42 +0200 Subject: [PATCH 28/40] Rust-toolchain file is now toml --- rust-toolchain.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 61081d4a8b..117147963b 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,4 @@ [toolchain] channel = "nightly-2022-10-30" targets = ["wasm32-unknown-unknown", "wasm32-unknown-unknown"] +components = ["clippy", "rustfmt"] From 5f18a34831b324a47d2077700a7b8fde3053f7d0 Mon Sep 17 00:00:00 2001 From: Marcin Date: Mon, 27 Mar 2023 22:00:30 +0200 Subject: [PATCH 29/40] Rust-toolchain file is now toml testing --- .github/workflows/_build-test-node-and-runtime.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/_build-test-node-and-runtime.yml b/.github/workflows/_build-test-node-and-runtime.yml index 1388942fa7..be2e847feb 100644 --- a/.github/workflows/_build-test-node-and-runtime.yml +++ b/.github/workflows/_build-test-node-and-runtime.yml @@ -26,8 +26,8 @@ jobs: - name: Install Rust toolchain uses: ./.github/actions/install-rust-toolchain - with: - targets: wasm32-unknown-unknown +# with: +# targets: wasm32-unknown-unknown - name: Build test binary and runtime run: | From b4cdc1891099c8b71cda3569bbcf354e32f657ff Mon Sep 17 00:00:00 2001 From: Marcin Date: Mon, 27 Mar 2023 22:03:22 +0200 Subject: [PATCH 30/40] Rust-toolchain file is now toml testing --- .github/actions/install-rust-toolchain/action.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/actions/install-rust-toolchain/action.yml b/.github/actions/install-rust-toolchain/action.yml index 09e26922b5..e2b704df06 100644 --- a/.github/actions/install-rust-toolchain/action.yml +++ b/.github/actions/install-rust-toolchain/action.yml @@ -64,7 +64,9 @@ runs: COMPONENTS: ${{ inputs.components || steps.toolchain-components.outputs.value }} run: | components=$(echo ${{ env.COMPONENTS }} | tr -d '[]' | sed 's/,/ /g') - rustup component add $components + for components in $components; do + rustup component add $component + done - name: Add targets (optional) if: inputs.target != '' || steps.toolchain-targets.outputs.value != '' From 875e2a0aca121d006c2b384189a9282e3e43003c Mon Sep 17 00:00:00 2001 From: Marcin Date: Mon, 27 Mar 2023 22:04:34 +0200 Subject: [PATCH 31/40] Rust-toolchain file is now toml testing --- .github/actions/install-rust-toolchain/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/install-rust-toolchain/action.yml b/.github/actions/install-rust-toolchain/action.yml index e2b704df06..4aac72de0b 100644 --- a/.github/actions/install-rust-toolchain/action.yml +++ b/.github/actions/install-rust-toolchain/action.yml @@ -64,7 +64,7 @@ runs: COMPONENTS: ${{ inputs.components || steps.toolchain-components.outputs.value }} run: | components=$(echo ${{ env.COMPONENTS }} | tr -d '[]' | sed 's/,/ /g') - for components in $components; do + for component in $components; do rustup component add $component done From 90361202456aecdc95b3a4aba2187b00a1ef5091 Mon Sep 17 00:00:00 2001 From: Marcin Date: Mon, 27 Mar 2023 22:06:10 +0200 Subject: [PATCH 32/40] Rust-toolchain file is now toml testing --- .github/actions/install-rust-toolchain/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/install-rust-toolchain/action.yml b/.github/actions/install-rust-toolchain/action.yml index 4aac72de0b..0e48dabdb5 100644 --- a/.github/actions/install-rust-toolchain/action.yml +++ b/.github/actions/install-rust-toolchain/action.yml @@ -75,7 +75,7 @@ runs: TARGETS: ${{ inputs.targets || steps.toolchain-targets.outputs.value }} run: | targets=$(echo ${{ env.TARGETS }} | tr -d '[]' | sed 's/,/ /g') - for target in ${{ env.TARGETS }}; do + for target in $targets; do rustup target add ${target} \ --toolchain ${{ steps.install-rust-toolchain.outputs.channel }} done From 00a042a8c260c695991a9e1952c7f6d354cb4495 Mon Sep 17 00:00:00 2001 From: Marcin Date: Mon, 27 Mar 2023 22:07:11 +0200 Subject: [PATCH 33/40] Rust-toolchain file is now toml testing --- .github/actions/install-rust-toolchain/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/install-rust-toolchain/action.yml b/.github/actions/install-rust-toolchain/action.yml index 0e48dabdb5..5953fd0d86 100644 --- a/.github/actions/install-rust-toolchain/action.yml +++ b/.github/actions/install-rust-toolchain/action.yml @@ -76,6 +76,6 @@ runs: run: | targets=$(echo ${{ env.TARGETS }} | tr -d '[]' | sed 's/,/ /g') for target in $targets; do - rustup target add ${target} \ + rustup target add $target \ --toolchain ${{ steps.install-rust-toolchain.outputs.channel }} done From 1980053ed9a990657b825e8e9de86093e19a878d Mon Sep 17 00:00:00 2001 From: Marcin Date: Mon, 27 Mar 2023 22:08:18 +0200 Subject: [PATCH 34/40] Rust-toolchain file is now toml testing --- rust-toolchain.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 117147963b..5325a892c5 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] channel = "nightly-2022-10-30" -targets = ["wasm32-unknown-unknown", "wasm32-unknown-unknown"] +targets = ["wasm32-unknown-unknown"] components = ["clippy", "rustfmt"] From d6e598ee7f3be7d22f7774516346bed45039e7cc Mon Sep 17 00:00:00 2001 From: Marcin Date: Mon, 27 Mar 2023 22:10:09 +0200 Subject: [PATCH 35/40] Rust-toolchain file is now toml testing --- .github/workflows/_build-test-node-and-runtime.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/_build-test-node-and-runtime.yml b/.github/workflows/_build-test-node-and-runtime.yml index be2e847feb..8b6fdf29b1 100644 --- a/.github/workflows/_build-test-node-and-runtime.yml +++ b/.github/workflows/_build-test-node-and-runtime.yml @@ -26,8 +26,10 @@ jobs: - name: Install Rust toolchain uses: ./.github/actions/install-rust-toolchain -# with: -# targets: wasm32-unknown-unknown + with: + channel: nightly-2022-10-29 + targets: wasm32-unknown-unknown wasm32-unknown-unknown + components: clippy rustfmt clippy - name: Build test binary and runtime run: | From 680bdd37bcc37d09165ab0915a25c74b4941684c Mon Sep 17 00:00:00 2001 From: Marcin Date: Mon, 27 Mar 2023 22:11:18 +0200 Subject: [PATCH 36/40] Rust-toolchain file is now toml testing --- .github/actions/install-rust-toolchain/action.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/actions/install-rust-toolchain/action.yml b/.github/actions/install-rust-toolchain/action.yml index 5953fd0d86..058ff44737 100644 --- a/.github/actions/install-rust-toolchain/action.yml +++ b/.github/actions/install-rust-toolchain/action.yml @@ -3,6 +3,9 @@ name: Install rust toolchain description: | Reads rust toolchain from rust-toolchain file and installs it. Optionally add given target. inputs: + channel: + description: Optional cargo target to install + required: false targets: description: Optional cargo target to install required: false From f6893f8e85ee0b8b0a028baefd650e87f2b5ab27 Mon Sep 17 00:00:00 2001 From: Marcin Date: Mon, 27 Mar 2023 22:15:35 +0200 Subject: [PATCH 37/40] Rust-toolchain file is now toml testing --- .github/actions/install-rust-toolchain/action.yml | 8 +++++++- .github/workflows/_build-test-node-and-runtime.yml | 8 +++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/actions/install-rust-toolchain/action.yml b/.github/actions/install-rust-toolchain/action.yml index 058ff44737..8bc1c097e3 100644 --- a/.github/actions/install-rust-toolchain/action.yml +++ b/.github/actions/install-rust-toolchain/action.yml @@ -1,7 +1,13 @@ --- name: Install rust toolchain description: | - Reads rust toolchain from rust-toolchain file and installs it. Optionally add given target. + Parses rust-toolchain.toml file and installs rust toolchain based on its contents: + * channel, e.g nightly-2022-10-30 + * list of targets, e.g. ["wasm32-unknown-unknown"] + * list of components, e.g. ["clippy", "rustfmt"] + Also, this action contains set of inputs that can override any of the above. + Existence of rust-toolchain.toml file is not mandatory, yet channel is then required to be + passed as an input. inputs: channel: description: Optional cargo target to install diff --git a/.github/workflows/_build-test-node-and-runtime.yml b/.github/workflows/_build-test-node-and-runtime.yml index 8b6fdf29b1..8220f60844 100644 --- a/.github/workflows/_build-test-node-and-runtime.yml +++ b/.github/workflows/_build-test-node-and-runtime.yml @@ -26,11 +26,9 @@ jobs: - name: Install Rust toolchain uses: ./.github/actions/install-rust-toolchain - with: - channel: nightly-2022-10-29 - targets: wasm32-unknown-unknown wasm32-unknown-unknown - components: clippy rustfmt clippy - +# with: +# targets: wasm32-unknown-unknown wasm32-unknown-unknown + - name: Build test binary and runtime run: | cargo build --release -p aleph-node \ From 8fa7c4bddf1ed497d1373bb563399cb4febbb885 Mon Sep 17 00:00:00 2001 From: Marcin Date: Mon, 27 Mar 2023 22:17:13 +0200 Subject: [PATCH 38/40] Rust-toolchain file is now toml testing --- rust-toolchain.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 5325a892c5..8dc85561f7 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,2 @@ [toolchain] channel = "nightly-2022-10-30" -targets = ["wasm32-unknown-unknown"] -components = ["clippy", "rustfmt"] From 0121b380147e4208e5731e8a5eb960a7e524dbca Mon Sep 17 00:00:00 2001 From: Marcin Date: Mon, 27 Mar 2023 22:21:41 +0200 Subject: [PATCH 39/40] Rust-toolchain file is now toml --- .github/actions/install-rust-toolchain/action.yml | 7 ++++--- .github/workflows/_build-test-node-and-runtime.yml | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/actions/install-rust-toolchain/action.yml b/.github/actions/install-rust-toolchain/action.yml index 8bc1c097e3..018133e3a8 100644 --- a/.github/actions/install-rust-toolchain/action.yml +++ b/.github/actions/install-rust-toolchain/action.yml @@ -10,13 +10,14 @@ description: | passed as an input. inputs: channel: - description: Optional cargo target to install + description: | + Toolchain channel. It's required only when rust-toolchain.toml file does not specify it. required: false targets: - description: Optional cargo target to install + description: Optional. List of targets to install with the given channel. required: false components: - description: Optional list of cargo components to install + description: Optional. List of cargo components to install. required: false runs: diff --git a/.github/workflows/_build-test-node-and-runtime.yml b/.github/workflows/_build-test-node-and-runtime.yml index 8220f60844..5e1eca1270 100644 --- a/.github/workflows/_build-test-node-and-runtime.yml +++ b/.github/workflows/_build-test-node-and-runtime.yml @@ -8,7 +8,7 @@ on: jobs: main: name: Build test node and runtime - runs-on: ubuntu-20.04 + runs-on: self-hosted env: RUST_BACKTRACE: full RUSTC_WRAPPER: sccache @@ -26,9 +26,9 @@ jobs: - name: Install Rust toolchain uses: ./.github/actions/install-rust-toolchain -# with: -# targets: wasm32-unknown-unknown wasm32-unknown-unknown - + with: + targets: wasm32-unknown-unknown + - name: Build test binary and runtime run: | cargo build --release -p aleph-node \ From 48830aab15dc305ffb871b8f94533c753e57e41d Mon Sep 17 00:00:00 2001 From: Marcin Date: Mon, 27 Mar 2023 22:26:58 +0200 Subject: [PATCH 40/40] Rust-toolchain file is now toml --- .github/actions/install-rust-toolchain/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/install-rust-toolchain/action.yml b/.github/actions/install-rust-toolchain/action.yml index 018133e3a8..d3f580ebd7 100644 --- a/.github/actions/install-rust-toolchain/action.yml +++ b/.github/actions/install-rust-toolchain/action.yml @@ -79,7 +79,7 @@ runs: done - name: Add targets (optional) - if: inputs.target != '' || steps.toolchain-targets.outputs.value != '' + if: inputs.targets != '' || steps.toolchain-targets.outputs.value != '' shell: bash env: TARGETS: ${{ inputs.targets || steps.toolchain-targets.outputs.value }}