From 14360670b7b3f6ea25e97ffc5f0ccd715071c671 Mon Sep 17 00:00:00 2001 From: Jorge Prendes Date: Thu, 7 Nov 2024 16:30:52 +0000 Subject: [PATCH] use ci-setup-workflow@use-rust-toolchain-toml branch Signed-off-by: Jorge Prendes --- .github/workflows/Benchmarks.yml | 4 +--- .github/workflows/CargoPublish.yml | 4 +--- .github/workflows/CreateRelease.yml | 12 +++--------- .github/workflows/ValidatePullRequest.yml | 8 ++------ .github/workflows/dep_build_guest_binaries.yml | 4 +--- .github/workflows/dep_fuzzing.yml | 6 ++---- .github/workflows/dep_rust.yml | 7 ++++--- 7 files changed, 14 insertions(+), 31 deletions(-) diff --git a/.github/workflows/Benchmarks.yml b/.github/workflows/Benchmarks.yml index 83d6ad7df..6fdcc65aa 100644 --- a/.github/workflows/Benchmarks.yml +++ b/.github/workflows/Benchmarks.yml @@ -35,9 +35,7 @@ jobs: - uses: actions/checkout@v4 - - uses: hyperlight-dev/ci-setup-workflow@v1.0.0 - with: - rust-toolchain: "1.81.0" + - uses: hyperlight-dev/ci-setup-workflow@use-rust-toolchain-toml env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/CargoPublish.yml b/.github/workflows/CargoPublish.yml index 56e223fc7..ae2294262 100644 --- a/.github/workflows/CargoPublish.yml +++ b/.github/workflows/CargoPublish.yml @@ -32,9 +32,7 @@ jobs: fetch-depth: 0 fetch-tags: true - - uses: hyperlight-dev/ci-setup-workflow@v1.0.0 - with: - rust-toolchain: "1.81.0" + - uses: hyperlight-dev/ci-setup-workflow@use-rust-toolchain-toml - name: Check crate versions shell: bash diff --git a/.github/workflows/CreateRelease.yml b/.github/workflows/CreateRelease.yml index faada1a21..77a0bce98 100644 --- a/.github/workflows/CreateRelease.yml +++ b/.github/workflows/CreateRelease.yml @@ -21,9 +21,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: hyperlight-dev/ci-setup-workflow@v1.0.0 - with: - rust-toolchain: "1.81.0" + - uses: hyperlight-dev/ci-setup-workflow@use-rust-toolchain-toml env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -41,9 +39,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: hyperlight-dev/ci-setup-workflow@v1.0.0 - with: - rust-toolchain: "1.81.0" + - uses: hyperlight-dev/ci-setup-workflow@use-rust-toolchain-toml env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -109,9 +105,7 @@ jobs: fetch-depth: 0 fetch-tags: true - - uses: hyperlight-dev/ci-setup-workflow@v1.0.0 - with: - rust-toolchain: "1.81.0" + - uses: hyperlight-dev/ci-setup-workflow@use-rust-toolchain-toml env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/ValidatePullRequest.yml b/.github/workflows/ValidatePullRequest.yml index 104ffd875..7922ccccf 100644 --- a/.github/workflows/ValidatePullRequest.yml +++ b/.github/workflows/ValidatePullRequest.yml @@ -54,9 +54,7 @@ jobs: systeminfo # Run this so we can use just targets in this workflow - - uses: hyperlight-dev/ci-setup-workflow@v1.0.0 - with: - rust-toolchain: "1.81.0" + - uses: hyperlight-dev/ci-setup-workflow@use-rust-toolchain-toml env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -114,9 +112,7 @@ jobs: echo "cat /etc/os-release" cat /etc/os-release - - uses: hyperlight-dev/ci-setup-workflow@v1.0.0 - with: - rust-toolchain: "1.81.0" + - uses: hyperlight-dev/ci-setup-workflow@use-rust-toolchain-toml env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/dep_build_guest_binaries.yml b/.github/workflows/dep_build_guest_binaries.yml index 1d3e1c4f5..e4eca8a9c 100644 --- a/.github/workflows/dep_build_guest_binaries.yml +++ b/.github/workflows/dep_build_guest_binaries.yml @@ -31,9 +31,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: hyperlight-dev/ci-setup-workflow@v1.0.0 - with: - rust-toolchain: "1.81.0" + - uses: hyperlight-dev/ci-setup-workflow@use-rust-toolchain-toml env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/dep_fuzzing.yml b/.github/workflows/dep_fuzzing.yml index e053d8b87..47a71087e 100644 --- a/.github/workflows/dep_fuzzing.yml +++ b/.github/workflows/dep_fuzzing.yml @@ -19,14 +19,12 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - uses: hyperlight-dev/ci-setup-workflow@v1.0.0 - with: - rust-toolchain: "1.81.0" + - uses: hyperlight-dev/ci-setup-workflow@use-rust-toolchain-toml env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Set up nightly rust - uses: dtolnay/rust-toolchain@nightly + run: rustup install nightly - name: Build rust binaries run: | diff --git a/.github/workflows/dep_rust.yml b/.github/workflows/dep_rust.yml index 89db2dd68..1dc8632a4 100644 --- a/.github/workflows/dep_rust.yml +++ b/.github/workflows/dep_rust.yml @@ -58,12 +58,13 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: hyperlight-dev/ci-setup-workflow@v1.0.0 - with: - rust-toolchain: "nightly" + - uses: hyperlight-dev/ci-setup-workflow@use-rust-toolchain-toml env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Set up nightly rust + run: rustup install nightly # used by rust-fmt + - name: fmt run: just fmt-check