From d0950ebc5af9337ea6a2152349f87521130d195c Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Mon, 13 Nov 2023 17:16:22 +0200 Subject: [PATCH 1/4] Use new setup rust action --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bb18a07..3404fbb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: mv wasi-sdk-* wasi-sdk - name: Setup Rust toolchain - uses: actions-rust-lang/setup-rust-toolchain@v1 + uses: dsherret/rust-toolchain-file@v1 - name: Setup marine uses: fluencelabs/setup-marine@v1 From 809a18fdcf35586498d35b8e51a57ac156436267 Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Mon, 13 Nov 2023 17:21:09 +0200 Subject: [PATCH 2/4] Fix e2e --- .github/workflows/e2e.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 182c9db..bd19d93 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -56,11 +56,11 @@ jobs: } ] - rust-peer: + nox: needs: - spell - uses: fluencelabs/rust-peer/.github/workflows/build.yml@master + uses: fluencelabs/nox/.github/workflows/build.yml@master with: cargo-dependencies: | [ @@ -76,32 +76,31 @@ jobs: } ] - rust-peer-snapshot: - name: "rust-peer" + nox-snapshot: + name: "nox" needs: - - rust-peer + - nox - uses: fluencelabs/rust-peer/.github/workflows/container.yml@master + uses: fluencelabs/nox/.github/workflows/container.yml@master with: image-name: "docker.fluence.dev/sqlite-wasm-connector" flavour: "minimal" - rust-peer-sha: "${{ needs.rust-peer.outputs.rust-peer-sha }}" spell-aqua-tests: name: "spell" needs: - - rust-peer-snapshot + - nox-snapshot uses: fluencelabs/spell/.github/workflows/tests.yml@main with: - rust-peer-image: "${{ needs.rust-peer-snapshot.outputs.rust-peer-image }}" + nox-image: "${{ needs.nox-snapshot.outputs.nox-image }}" registry: needs: - snapshot - - rust-peer-snapshot + - nox-snapshot uses: fluencelabs/registry/.github/workflows/tests.yml@main with: - rust-peer-image: "${{ needs.rust-peer-snapshot.outputs.rust-peer-image }}" + nox-image: "${{ needs.nox-snapshot.outputs.nox-image }}" cargo-dependencies: | [ { From dedb9286185cba6bd50b57a0311af1c2421ad5ea Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Mon, 13 Nov 2023 17:22:22 +0200 Subject: [PATCH 3/4] Add rust-toolchain file --- rust-toolchain.toml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 rust-toolchain.toml diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000..fa5eec4 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,9 @@ +[toolchain] +channel = "nightly-2023-08-27" +components = [ + "rustfmt", + "clippy", +] +targets = [ + "x86_64-unknown-linux-gnu", +] From 02cfca2ad1342061e4eae4e9af136bf381ad7833 Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Mon, 13 Nov 2023 17:39:12 +0200 Subject: [PATCH 4/4] Fix --- .github/workflows/e2e.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index bd19d93..b6434d7 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -56,9 +56,24 @@ jobs: } ] + decider: + needs: + - spell + uses: fluencelabs/decider/.github/workflows/snapshot.yml@main + with: + cargo-dependencies: | + [ + { + "package": "fluence-spell-dtos", + "version": "=${{ needs.spell.outputs.cargo-version }}", + "registry": "fluence" + } + ] + nox: needs: - spell + - decider uses: fluencelabs/nox/.github/workflows/build.yml@master with: @@ -73,6 +88,12 @@ jobs: "package": "fluence-spell-distro", "version": "=${{ needs.spell.outputs.cargo-version }}", "registry": "fluence" + }, + { + "package": "decider-distro", + "version": "=${{ needs.decider.outputs.cargo-version }}", + "manifest": "crates/system-services/Cargo.toml", + "registry": "fluence" } ]