rust-toolchain to rust-toolchain.toml (#1689)

* rust-toolchain to rust-toolchain\.toml

* workflows rust-toolchain -> rust-toolchain.toml

* fix workflows

* fix target

* install rust

---------

Co-authored-by: Dakota Brink <[email protected]>

.github/workflows/cargo-deny-checker.yml

@@ -5,7 +5,6 @@ on:
       - main
   pull_request:
   workflow_dispatch:
-
 jobs:
   cargo-deny:
     runs-on: warp-ubuntu-latest-x64-16x
@@ -16,12 +15,21 @@ jobs:
           - bans
           - licenses
           - sources
-
     steps:
       - uses: actions/checkout@v4
+      # Install Rust toolchain
+      - name: Install Rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+
+      # Run cargo-deny with the installed toolchain
       - uses: EmbarkStudios/cargo-deny-action@v2
         with:
           command: check ${{ matrix.checks }}
+          rust-version: stable # Use the stable toolchain we just installed
 
     # Prevent sudden announcement of a new advisory from failing CI
-    continue-on-error: ${{ matrix.checks == 'advisories' }}
+    continue-on-error: ${{ matrix.checks == 'advisories' }}

.github/workflows/check-ios-android-bindings.yml

@@ -10,7 +10,7 @@ on:
       - "Cargo.toml"
       - "Cargo.lock"
       - "dev/**"
-      - "rust-toolchain"
+      - "rust-toolchain.toml"
       - ".cargo/**"
 jobs:
   check-swift:

.github/workflows/lint-node-bindings.yaml

@@ -8,7 +8,7 @@ on:
       - "Cargo.toml"
       - "Cargo.lock"
       - ".cargo/**"
-      - "rust-toolchain"
+      - "rust-toolchain.toml"
 jobs:
   lint:
     name: Lint

.github/workflows/lint-wasm-bindings.yaml

@@ -8,7 +8,7 @@ on:
       - "Cargo.toml"
       - "Cargo.lock"
       - ".cargo/**"
-      - "rust-toolchain"
+      - "rust-toolchain.toml"
 env:
   CARGO_TERM_COLOR: always
   CARGO_INCREMENTAL: 0
@@ -22,7 +22,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Update rust toolchains
-        run: rustup update
+        run: |
+          rustup update
+          rustup target add wasm32-unknown-unknown
       - name: Cache
         uses: Swatinem/rust-cache@v2
         with:

.github/workflows/lint-workspace.yaml

@@ -19,7 +19,7 @@ on:
       - "Cargo.toml"
       - "Cargo.lock"
       - ".cargo/**"
-      - "rust-toolchain"
+      - "rust-toolchain.toml"
       - "rustfmt.toml"
 env:
   CARGO_TERM_COLOR: always

.github/workflows/noop.yml

@@ -21,7 +21,7 @@ on:
       - "!.node-version"
       - "!Cargo.toml"
       - "!Cargo.lock"
-      - "!rust-toolchain"
+      - "!rust-toolchain.toml"
       - "!rustfmt.toml"
 # Test and Lint steps are required for pull requests, but some file changes
 # don't require them to run. These jobs define the required steps for these

.github/workflows/test-ffi-bindings.yml

@@ -18,7 +18,7 @@ on:
       - "Cargo.toml"
       - "Cargo.lock"
       - ".cargo/**"
-      - "rust-toolchain"
+      - "rust-toolchain.toml"
 env:
   CARGO_TERM_COLOR: always
   CARGO_INCREMENTAL: 0

.github/workflows/test-http-api.yml

@@ -17,7 +17,7 @@ on:
       - "Cargo.toml"
       - "Cargo.lock"
       - ".cargo/**"
-      - "rust-toolchain"
+      - "rust-toolchain.toml"
 env:
   CARGO_TERM_COLOR: always
   CARGO_INCREMENTAL: 0

.github/workflows/test-node-bindings.yml

@@ -1,10 +1,8 @@
 name: Test Node Bindings
-
 on:
   push:
     branches:
       - main
-
   pull_request:
     # only run tests when related changes are made
     paths:
@@ -21,29 +19,24 @@ on:
       - "Cargo.toml"
       - "Cargo.lock"
       - ".cargo/**"
-      - "rust-toolchain"
-
+      - "rust-toolchain.toml"
 jobs:
   test:
     name: Test
     runs-on: warp-ubuntu-latest-x64-16x
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-
       - name: Update rust toolchains
         run: rustup update
-
       - name: Cache
         uses: Swatinem/rust-cache@v2
         with:
           workspaces: |
             .
             bindings_node
-
       - name: Start Docker containers
         run: dev/up
-
       - name: Setup node
         uses: actions/setup-node@v4
         with:
@@ -52,20 +45,16 @@ jobs:
           cache: "yarn"
         env:
           SKIP_YARN_COREPACK_CHECK: "1"
-
       - name: Enable corepack
         run: corepack enable
-
       - name: Install dependencies
         working-directory: bindings_node
         run: |
           yarn
-
       - name: Build release
         working-directory: bindings_node
         run: |
           yarn build
-
       - name: Run tests
         working-directory: bindings_node
         run: |

.github/workflows/test-webassembly.yml

@@ -14,7 +14,7 @@ on:
       - "Cargo.toml"
       - "Cargo.lock"
       - ".cargo/**"
-      - "rust-toolchain"
+      - "rust-toolchain.toml"
 env:
   CARGO_TERM_COLOR: always
   CARGO_INCREMENTAL: 0

.github/workflows/test-workspace.yml

@@ -17,7 +17,7 @@ on:
       - "Cargo.toml"
       - "Cargo.lock"
       - ".cargo/**"
-      - "rust-toolchain"
+      - "rust-toolchain.toml"
 env:
   CARGO_TERM_COLOR: always
   CARGO_INCREMENTAL: 0

nix/libxmtp.nix

@@ -42,7 +42,7 @@ let
         });
 
   rust-toolchain = fenix.fromToolchainFile {
-    file = ./../rust-toolchain;
+    file = ./../rust-toolchain.toml;
     sha256 = "sha256-AJ6LX/Q/Er9kS15bn9iflkUwcgYqRQxiOIL2ToVAXaU=";
   };
 in

rust-toolchain → rust-toolchain.toml

@@ -1,11 +1,11 @@
 [toolchain]
 channel = "stable"
-components = [ "rustc", "cargo", "clippy", "rustfmt", "rust-analyzer" ]
+components = ["rustc", "cargo", "clippy", "rustfmt", "rust-analyzer"]
 targets = [
   "wasm32-unknown-unknown",
   "x86_64-unknown-linux-gnu",
   "x86_64-apple-ios",
   "x86_64-apple-darwin",
-  "aarch64-apple-ios"
+  "aarch64-apple-ios",
 ]
 profile = "default"