From d421a750a089256cb72b67137df7037b918df5d2 Mon Sep 17 00:00:00 2001 From: Hithem <0xrequiem1@gmail.com> Date: Wed, 6 Mar 2024 15:04:25 +0100 Subject: [PATCH 1/4] fix(workflows): fix toolchain and cache issue. --- .github/workflows/linters-cargo.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linters-cargo.yml b/.github/workflows/linters-cargo.yml index feac1282b..ddd433804 100644 --- a/.github/workflows/linters-cargo.yml +++ b/.github/workflows/linters-cargo.yml @@ -6,7 +6,6 @@ on: workflow_call: jobs: - # FIXME: check why this is rebuilding the project every time cargo-lint: runs-on: ubuntu-latest steps: @@ -14,11 +13,25 @@ jobs: - uses: Swatinem/rust-cache@v2 with: shared-key: "cache" - save-if: false + - uses: actions/cache@v3 + with: + path: | + target/release/deoxys + key: ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}-${{ + github.run_id }} + restore-keys: | + ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }} + ${{ runner.os }}-cargo- + + - name: Setup rust toolchain + if: steps.cache.outputs.cache-hit != 'true' + run: rustup show + - name: Setup build deps run: | sudo apt-get update sudo apt-get install -y clang llvm libudev-dev protobuf-compiler libasound2-dev + - name: Format and clippy run: | cargo fmt -- --check From f4a7af2d4f206a89b1b20d8f2f6e9d43c84c9ed8 Mon Sep 17 00:00:00 2001 From: Hithem <0xrequiem1@gmail.com> Date: Wed, 6 Mar 2024 15:40:13 +0100 Subject: [PATCH 2/4] fix(workflows): add toolchain into workflow. --- .github/workflows/linters-cargo.yml | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/.github/workflows/linters-cargo.yml b/.github/workflows/linters-cargo.yml index ddd433804..bdb7a0542 100644 --- a/.github/workflows/linters-cargo.yml +++ b/.github/workflows/linters-cargo.yml @@ -13,19 +13,12 @@ jobs: - uses: Swatinem/rust-cache@v2 with: shared-key: "cache" - - uses: actions/cache@v3 + - uses: actions-rs/toolchain@v1 with: - path: | - target/release/deoxys - key: ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}-${{ - github.run_id }} - restore-keys: | - ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }} - ${{ runner.os }}-cargo- - - - name: Setup rust toolchain - if: steps.cache.outputs.cache-hit != 'true' - run: rustup show + toolchain: nightly-2023-08-24 + components: rustfmt, clippy + target: wasm32-unknown-unknown + profile: minimal - name: Setup build deps run: | From ecd0fffabb52a06194cf91b07fa62842f22a0acd Mon Sep 17 00:00:00 2001 From: hithem <117039823+hel-kame@users.noreply.github.com> Date: Wed, 6 Mar 2024 15:59:56 +0100 Subject: [PATCH 3/4] update rust-check.yml --- .github/workflows/rust-check.yml | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/.github/workflows/rust-check.yml b/.github/workflows/rust-check.yml index baa20e71e..a4f97ced8 100644 --- a/.github/workflows/rust-check.yml +++ b/.github/workflows/rust-check.yml @@ -13,19 +13,12 @@ jobs: - uses: Swatinem/rust-cache@v2 with: shared-key: "cache" - - uses: actions/cache@v3 + - uses: actions-rs/toolchain@v1 with: - path: | - target/release/deoxys - key: ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}-${{ - github.run_id }} - restore-keys: | - ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }} - ${{ runner.os }}-cargo- - - - name: Setup rust toolchain - if: steps.cache.outputs.cache-hit != 'true' - run: rustup show + toolchain: nightly-2023-08-24 + components: rustfmt, clippy + target: wasm32-unknown-unknown + profile: minimal - name: Setup check deps run: | From e9c2ce96c84773752473e8741e4a5f26bfe1962c Mon Sep 17 00:00:00 2001 From: hithem <117039823+hel-kame@users.noreply.github.com> Date: Wed, 6 Mar 2024 17:01:41 +0100 Subject: [PATCH 4/4] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f241eaa45..6b6a7a1df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ git # Deoxys Changelog ## Next release +- fix(worflows): fix toolchain and cache issue - feat: Removal of the hardcoded mainnet configuration - refactor: pass new CI - fix(workflows): Fix deoxys CI