From 40304383d463a689ae315d5d3299ec086e4d949f Mon Sep 17 00:00:00 2001 From: Maximilian Ammann Date: Sun, 23 Oct 2022 14:01:53 +0200 Subject: [PATCH] First install just --- .github/actions/cargo-install/action.yml | 3 +++ .github/workflows/build-deploy-docs.yml | 6 +++--- .github/workflows/demo-linux.yml | 10 +++++----- .github/workflows/demo-windows.yml | 10 +++++----- .github/workflows/library-apple.yml | 10 +++++----- .github/workflows/run-benchmarks.yml | 10 +++++----- .github/workflows/run-checks.yml | 6 +++--- .github/workflows/run-tests.yml | 10 +++++----- 8 files changed, 34 insertions(+), 31 deletions(-) diff --git a/.github/actions/cargo-install/action.yml b/.github/actions/cargo-install/action.yml index a5fcc362..c132833b 100644 --- a/.github/actions/cargo-install/action.yml +++ b/.github/actions/cargo-install/action.yml @@ -9,6 +9,9 @@ inputs: runs: using: "composite" steps: + - name: Setup default toolchain + shell: bash + run: rustup show # Installs toolchain specified in rust-toolchain.toml - name: Install ${{ inputs.name }} shell: bash run: cargo binstall --no-confirm ${{ inputs.name }} diff --git a/.github/workflows/build-deploy-docs.yml b/.github/workflows/build-deploy-docs.yml index 521d114e..16397447 100644 --- a/.github/workflows/build-deploy-docs.yml +++ b/.github/workflows/build-deploy-docs.yml @@ -14,15 +14,15 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 - - name: Install toolchain - shell: bash - run: just stable-toolchain - name: Setup binstall uses: ./.github/actions/setup-binstall - name: Install just uses: ./.github/actions/cargo-install with: name: just + - name: Install toolchain + shell: bash + run: just stable-toolchain - uses: Swatinem/rust-cache@v2 - name: Install mdbook uses: ./.github/actions/cargo-install diff --git a/.github/workflows/demo-linux.yml b/.github/workflows/demo-linux.yml index 28b73a7b..59ef3914 100644 --- a/.github/workflows/demo-linux.yml +++ b/.github/workflows/demo-linux.yml @@ -9,17 +9,17 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 - - name: Install toolchain - shell: bash - run: | - just stable-toolchain - just stable-targets x86_64-unknown-linux-gnu - name: Setup binstall uses: ./.github/actions/setup-binstall - name: Install just uses: ./.github/actions/cargo-install with: name: just + - name: Install toolchain + shell: bash + run: | + just stable-toolchain + just stable-targets x86_64-unknown-linux-gnu - uses: Swatinem/rust-cache@v2 - name: Install Dependencies shell: bash diff --git a/.github/workflows/demo-windows.yml b/.github/workflows/demo-windows.yml index eea2a2d7..f8c30932 100644 --- a/.github/workflows/demo-windows.yml +++ b/.github/workflows/demo-windows.yml @@ -9,17 +9,17 @@ jobs: runs-on: windows-2022 steps: - uses: actions/checkout@v3 - - name: Install toolchain - shell: bash - run: | - just stable-toolchain - just stable-targets x86_64-pc-windows-msvc - name: Setup binstall uses: ./.github/actions/setup-binstall - name: Install just uses: ./.github/actions/cargo-install with: name: just + - name: Install toolchain + shell: bash + run: | + just stable-toolchain + just stable-targets x86_64-pc-windows-msvc - uses: Swatinem/rust-cache@v2 - uses: ilammy/msvc-dev-cmd@v1 # Provide access to lib.exe - name: Build diff --git a/.github/workflows/library-apple.yml b/.github/workflows/library-apple.yml index 6df62094..37ed5fc0 100644 --- a/.github/workflows/library-apple.yml +++ b/.github/workflows/library-apple.yml @@ -10,17 +10,17 @@ jobs: runs-on: macos-12 steps: - uses: actions/checkout@v3 - - name: Install toolchain - shell: bash - run: | - just stable-toolchain - just stable-targets x86_64-apple-darwin aarch64-apple-darwin x86_64-apple-ios aarch64-apple-ios aarch64-apple-ios-sim - name: Setup binstall uses: ./.github/actions/setup-binstall - name: Install just uses: ./.github/actions/cargo-install with: name: just + - name: Install toolchain + shell: bash + run: | + just stable-toolchain + just stable-targets x86_64-apple-darwin aarch64-apple-darwin x86_64-apple-ios aarch64-apple-ios aarch64-apple-ios-sim - uses: Swatinem/rust-cache@v2 - name: Build shell: bash diff --git a/.github/workflows/run-benchmarks.yml b/.github/workflows/run-benchmarks.yml index 90e7499e..699ee1de 100644 --- a/.github/workflows/run-benchmarks.yml +++ b/.github/workflows/run-benchmarks.yml @@ -9,17 +9,17 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 - - name: Install toolchain - shell: bash - run: | - just stable-toolchain - just stable-targets x86_64-unknown-linux-gnu - name: Setup binstall uses: ./.github/actions/setup-binstall - name: Install just uses: ./.github/actions/cargo-install with: name: just + - name: Install toolchain + shell: bash + run: | + just stable-toolchain + just stable-targets x86_64-unknown-linux-gnu - uses: Swatinem/rust-cache@v2 - name: Install GPU Drivers uses: ./.github/actions/install-driver diff --git a/.github/workflows/run-checks.yml b/.github/workflows/run-checks.yml index bc92c26a..a7ef2844 100644 --- a/.github/workflows/run-checks.yml +++ b/.github/workflows/run-checks.yml @@ -9,15 +9,15 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 - - name: Install toolchain - shell: bash - run: just stable-toolchain - name: Setup binstall uses: ./.github/actions/setup-binstall - name: Install just uses: ./.github/actions/cargo-install with: name: just + - name: Install toolchain + shell: bash + run: just stable-toolchain - uses: Swatinem/rust-cache@v2 - name: Format shell: bash diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 537a4584..bbbaecf3 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -9,17 +9,17 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 - - name: Install toolchain - shell: bash - run: | - just stable-toolchain - just stable-targets x86_64-unknown-linux-gnu - name: Setup binstall uses: ./.github/actions/setup-binstall - name: Install just uses: ./.github/actions/cargo-install with: name: just + - name: Install toolchain + shell: bash + run: | + just stable-toolchain + just stable-targets x86_64-unknown-linux-gnu - uses: Swatinem/rust-cache@v2 - name: Install GPU Drivers uses: ./.github/actions/install-driver