Merge remote-tracking branch 'upstream/main' into withdrawals

topos-protocol · Apr 18, 2024 · de2a23c · de2a23c
2 parents cf771a4 + ab16585
commit de2a23c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/cI.yml → .github/workflows/ci.yml b/.github/workflows/cI.yml → .github/workflows/ci.yml
@@ -24,7 +24,7 @@ jobs:
     if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')"
     steps:
       - uses: actions/checkout@v4
-        uses: dtolnay/rust-toolchain@nightly
+      - uses: dtolnay/rust-toolchain@nightly
         with:
             components: clippy
       - uses: Swatinem/rust-cache@v2
@@ -40,7 +40,7 @@ jobs:
     if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')"
     steps:
         - uses: actions/checkout@v4
-        uses: dtolnay/rust-toolchain@nightly
+        - uses: dtolnay/rust-toolchain@nightly
           with:
             components: rustfmt
         - run: cargo fmt --all --check
@@ -51,8 +51,7 @@ jobs:
     if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')"
     steps:
       - uses: actions/checkout@v4
-        uses: dtolnay/rust-toolchain@nightly
-        with:
+      - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
         with:
             cache-on-failure: true

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2024-02-01"
+channel = "nightly"