Merge branch 'master' into 3777-migrate-to-fluvio-install-gh-action-a…

…pproach
infinyon · Dec 14, 2023 · 9cb96f4 · 9cb96f4
2 parents 61a9133 + 68eafc4
commit 9cb96f4
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 30 deletions.
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -23,11 +23,8 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v4
 
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
 
       - name: Cache Rust Cargo files
         uses: Swatinem/rust-cache@v2
@@ -69,11 +66,8 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v4
 
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
 
       - name: Cache Rust Cargo files
         uses: Swatinem/rust-cache@v2

diff --git a/.github/workflows/ci_mac.yaml b/.github/workflows/ci_mac.yaml
@@ -87,12 +87,10 @@ jobs:
       - name: Print env
         run: |
           echo "RUST_BIN_DIR = ${{ env.RUST_BIN_DIR }} "
-      - name: Install Rust ${{ matrix.rust }}
-        uses: actions-rs/toolchain@v1
+      - name: Install Rust ${{ matrix.rust }} toolchain
+        uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust }}
-          profile: minimal
-          override: true
       - name: Install zig
         run: ./actions/zig-install.sh ${{ matrix.os }}
       - uses: Swatinem/rust-cache@v2
@@ -176,7 +174,7 @@ jobs:
           kind create cluster --config k8-util/cluster/kind.yaml
       - name: Start fluvio cluster
         timeout-minutes: 5
-        run: fluvio cluster start --local --develop --spu ${{ matrix.spu }} --rust-log fluvio=debug 
+        run: fluvio cluster start --local --develop --spu ${{ matrix.spu }} --rust-log fluvio=debug
       - name: Run smoke-test
         timeout-minutes: 5
         run: |

diff --git a/.github/workflows/ci_unused_deps.yml b/.github/workflows/ci_unused_deps.yml
@@ -30,12 +30,11 @@ jobs:
       TARGET: ${{ matrix.rust-target }}
     steps:
       - uses: actions/checkout@v4
-      - name: Install Rust ${{ matrix.rust }}
-        uses: actions-rs/toolchain@v1
+      - name: Install Rust ${{ matrix.rust }} toolchain
+        uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust }}
-          profile: minimal
-          override: true
+          targets: ${{ matrix.rust-target }}
       - name: Install Zig
         run: ./actions/zig-install.sh ${{ matrix.os }}
       - uses: Swatinem/rust-cache@v2

diff --git a/.github/workflows/hourly.yml b/.github/workflows/hourly.yml
@@ -41,12 +41,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install Rust ${{ matrix.rust }}
-        uses: actions-rs/toolchain@v1
+      - name: Install Rust ${{ matrix.rust }} Toolchain
+        uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust }}
-          profile: minimal
-          override: true
+
       - name: Install zig
         run: ./actions/zig-install.sh ${{ matrix.os }}
       - uses: Swatinem/rust-cache@v2

diff --git a/.github/workflows/publish_crates.yml b/.github/workflows/publish_crates.yml
@@ -1,4 +1,4 @@
-name: Publish crates to crates.io 
+name: Publish crates to crates.io
 
 permissions:
   contents: read
@@ -33,7 +33,7 @@ jobs:
   #    - name: Get status of latest CD_Dev run
   #      id: cd_dev_check
   #      run: |
-  #        gh api /repos/{owner}/{repo}/actions/workflows/cd_dev.yaml/runs | jq .workflow_runs[0] > /tmp/cd_dev_latest.txt  
+  #        gh api /repos/{owner}/{repo}/actions/workflows/cd_dev.yaml/runs | jq .workflow_runs[0] > /tmp/cd_dev_latest.txt
   #        echo "Latest CD_Dev run: $(cat /tmp/cd_dev_latest.txt | jq .html_url | tr -d '"')"
   #        CD_DEV_CHECK=$(cat /tmp/cd_dev_latest.txt | jq .conclusion | tr -d '"')
   #        if [[ "$CD_DEV_CHECK" = "success" ]]
@@ -45,19 +45,17 @@ jobs:
   #          exit 1;
   #        fi
   publish_crates:
-    name: Publish crates to crates.io 
+    name: Publish crates to crates.io
     strategy:
       matrix:
         rust: [stable]
     runs-on: ubuntu-latest
     #permissions: write-all
     steps:
-      - name: Install Rust ${{ matrix.rust }}
-        uses: actions-rs/toolchain@v1
+      - name: Install Rust ${{ matrix.rust }} toolchain
+        uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust }}
-          profile: minimal
-          override: true
 
       - uses: actions/checkout@v4
         with: