add rust-toolchain.toml

workflow: clean up configs

Author: a5-pickle

.github/workflows/solana.yml

@@ -1,4 +1,5 @@
 name: solana
+
 on:
   push:
     branches:
@@ -8,7 +9,9 @@ on:
       - 'solana/**'
 
 env:
+  CARGO_TERM_COLOR: always
   RUSTC_VERSION: 1.75.0
+
 jobs:
   cancel-previous-runs:
     runs-on: ubuntu-latest
@@ -17,6 +20,7 @@ jobs:
         uses: styfle/cancel-workflow-action@0.9.1
         with:
           access_token: ${{ github.token }}
+
   make-cargo-test-all:
     name: make cargo-test-all
     runs-on: ubuntu-latest
@@ -26,10 +30,10 @@ jobs:
         uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ env.RUSTC_VERSION }}
-          components: clippy, rustfmt
       - name: make cargo-test-all
         run: make cargo-test-all
         working-directory: ./solana
+
   make-lint:
     name: make lint
     runs-on: ubuntu-latest
@@ -43,6 +47,7 @@ jobs:
       - name: make lint
         run: make lint
         working-directory: ./solana
+
   make-check-idl:
     name: make check-idl
     runs-on: ubuntu-latest
@@ -59,6 +64,7 @@ jobs:
       - name: make check-idl
         run: make check-idl
         working-directory: ./solana
+
   make-anchor-test:
     name: make anchor-test
     runs-on: ubuntu-latest
@@ -79,6 +85,7 @@ jobs:
       - name: make anchor-test
         run: make anchor-test
         working-directory: ./solana
+
   make-anchor-test-upgrade:
     name: make anchor-test-upgrade
     runs-on: ubuntu-latest

.github/workflows/universal-rs.yml

@@ -1,64 +1,76 @@
 name: universal-rs
 
 on:
-    push:
-        branches: [main]
-    pull_request:
-        paths:
-            - 'universal/**'
+  push:
+    branches:
+      - main
+  pull_request:
+    paths:
+      - 'universal/**'
 
 env:
-    CARGO_TERM_COLOR: always
+  CARGO_TERM_COLOR: always
+  RUSTC_VERSION: 1.75.0
 
 jobs:
-    test:
-        name: test ${{ matrix.rust }}
-        runs-on: ubuntu-latest
-        timeout-minutes: 30
-        strategy:
-            fail-fast: false
-            matrix:
-                rust: ["stable", "beta", "nightly", "1.75"] # MSRV
-        steps:
-            - uses: actions/checkout@v3
-            - uses: dtolnay/rust-toolchain@master
-              with:
-                  toolchain: ${{ matrix.rust }}
-            - uses: Swatinem/rust-cache@v2
-            - name: test
-              run: cd universal/rs && cargo test --workspace --all-features
+  test:
+    name: test
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install toolchain
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ env.RUSTC_VERSION }}
+      - name: test
+        run: cargo test --workspace --all-features
+        working-directory: ./universal/rs
 
-    clippy:
-        name: clippy
-        runs-on: ubuntu-latest
-        timeout-minutes: 30
-        steps:
-            - uses: actions/checkout@v3
-            - uses: dtolnay/rust-toolchain@clippy
-            - run: cd universal/rs && cargo clippy --workspace --all-targets
-              env:
-                  RUSTFLAGS: -Dwarnings
+  clippy:
+    name: clippy
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install toolchain
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ env.RUSTC_VERSION }}
+          components: clippy
+      - run: cargo clippy --workspace --all-targets
+        working-directory: ./universal/rs
+        env:
+          RUSTFLAGS: -Dwarnings
 
-    docs:
-        name: docs
-        runs-on: ubuntu-latest
-        timeout-minutes: 30
-        steps:
-            - uses: actions/checkout@v3
-            - uses: dtolnay/rust-toolchain@nightly
-              with:
-                  components: rust-docs
-            - run: cd universal/rs && cargo doc --workspace --no-deps --document-private-items
-              env:
-                  RUSTDOCFLAGS: "--cfg docsrs -D warnings"
+  docs:
+    name: docs
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install toolchain
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ env.RUSTC_VERSION }}
+          components: rust-docs
+      - run: cargo doc --workspace --no-deps --document-private-items
+        working-directory: ./universal/rs
+        env:
+          RUSTDOCFLAGS: "--cfg docsrs -D warnings"
 
-    fmt:
-        name: fmt
-        runs-on: ubuntu-latest
-        timeout-minutes: 30
-        steps:
-            - uses: actions/checkout@v3
-            - uses: dtolnay/rust-toolchain@nightly
-              with:
-                  components: rustfmt
-            - run: cd universal/rs && cargo fmt --all --check
+  fmt:
+    name: fmt
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install toolchain
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ env.RUSTC_VERSION }}
+          components: rustfmt
+      - run: cargo fmt --all --check
+        working-directory: ./universal/rs

solana/rust-toolchain.toml

@@ -0,0 +1,8 @@
+[toolchain]
+channel = "1.75"
+components = [
+    "clippy",
+    "rustfmt",
+    "rustc-dev"
+]
+profile = "minimal"

universal/rs/rust-toolchain.toml

@@ -0,0 +1,8 @@
+[toolchain]
+channel = "1.75"
+components = [
+    "clippy",
+    "rustfmt",
+    "rustc-dev"
+]
+profile = "minimal"