From 7b41971b67237aa562e2c5bf0d995621680064ea Mon Sep 17 00:00:00 2001 From: Maximilian Ammann Date: Sun, 23 Oct 2022 12:35:28 +0200 Subject: [PATCH] Fix install --- .github/actions/cargo-install/action.yml | 14 ++++++++++++++ .github/actions/setup-binstall/action.yml | 4 ++-- .github/workflows/build-deploy-docs.yml | 5 +++-- .github/workflows/demo-linux.yml | 5 +++-- .github/workflows/demo-macos.yml | 5 +++-- .github/workflows/demo-windows.yml | 5 +++-- .github/workflows/library-android.yml | 5 +++-- .github/workflows/library-apple.yml | 5 +++-- .github/workflows/library-web.yml | 5 +++-- .github/workflows/run-benchmarks.yml | 5 +++-- .github/workflows/run-checks.yml | 5 +++-- .github/workflows/run-tests.yml | 5 +++-- 12 files changed, 46 insertions(+), 22 deletions(-) create mode 100644 .github/actions/cargo-install/action.yml diff --git a/.github/actions/cargo-install/action.yml b/.github/actions/cargo-install/action.yml new file mode 100644 index 00000000..a5fcc362 --- /dev/null +++ b/.github/actions/cargo-install/action.yml @@ -0,0 +1,14 @@ +name: cargo-install +description: Install a dependency from cargo + +inputs: + name: + required: true + description: Name of the dependency + +runs: + using: "composite" + steps: + - name: Install ${{ inputs.name }} + shell: bash + run: cargo binstall --no-confirm ${{ inputs.name }} diff --git a/.github/actions/setup-binstall/action.yml b/.github/actions/setup-binstall/action.yml index b49a55e8..db8e7468 100644 --- a/.github/actions/setup-binstall/action.yml +++ b/.github/actions/setup-binstall/action.yml @@ -1,5 +1,5 @@ -name: install-driver -description: Install drivers +name: setup-binstall +description: Setup binstall runs: using: "composite" diff --git a/.github/workflows/build-deploy-docs.yml b/.github/workflows/build-deploy-docs.yml index c2cc3b37..bd2d57a6 100644 --- a/.github/workflows/build-deploy-docs.yml +++ b/.github/workflows/build-deploy-docs.yml @@ -17,8 +17,9 @@ jobs: - name: Setup binstall uses: ./.github/actions/setup-binstall - name: Install just - shell: bash - run: cargo binstall just + uses: ./.github/actions/cargo-install + with: + name: just - name: Install toolchain shell: bash run: just stable-toolchain diff --git a/.github/workflows/demo-linux.yml b/.github/workflows/demo-linux.yml index b1974d5e..59ef3914 100644 --- a/.github/workflows/demo-linux.yml +++ b/.github/workflows/demo-linux.yml @@ -12,8 +12,9 @@ jobs: - name: Setup binstall uses: ./.github/actions/setup-binstall - name: Install just - shell: bash - run: cargo binstall just + uses: ./.github/actions/cargo-install + with: + name: just - name: Install toolchain shell: bash run: | diff --git a/.github/workflows/demo-macos.yml b/.github/workflows/demo-macos.yml index 909e40b4..ce175f4f 100644 --- a/.github/workflows/demo-macos.yml +++ b/.github/workflows/demo-macos.yml @@ -12,8 +12,9 @@ jobs: - name: Setup binstall uses: ./.github/actions/setup-binstall - name: Install just - shell: bash - run: cargo binstall just + uses: ./.github/actions/cargo-install + with: + name: just - name: Install toolchain shell: bash run: | diff --git a/.github/workflows/demo-windows.yml b/.github/workflows/demo-windows.yml index 53f8490f..f8c30932 100644 --- a/.github/workflows/demo-windows.yml +++ b/.github/workflows/demo-windows.yml @@ -12,8 +12,9 @@ jobs: - name: Setup binstall uses: ./.github/actions/setup-binstall - name: Install just - shell: bash - run: cargo binstall just + uses: ./.github/actions/cargo-install + with: + name: just - name: Install toolchain shell: bash run: | diff --git a/.github/workflows/library-android.yml b/.github/workflows/library-android.yml index da4d1f20..de49b5b2 100644 --- a/.github/workflows/library-android.yml +++ b/.github/workflows/library-android.yml @@ -12,8 +12,9 @@ jobs: - name: Setup binstall uses: ./.github/actions/setup-binstall - name: Install just - shell: bash - run: cargo binstall just + uses: ./.github/actions/cargo-install + with: + name: just - name: Install nightly toolchain shell: bash run: | diff --git a/.github/workflows/library-apple.yml b/.github/workflows/library-apple.yml index a6be1f80..37ed5fc0 100644 --- a/.github/workflows/library-apple.yml +++ b/.github/workflows/library-apple.yml @@ -13,8 +13,9 @@ jobs: - name: Setup binstall uses: ./.github/actions/setup-binstall - name: Install just - shell: bash - run: cargo binstall just + uses: ./.github/actions/cargo-install + with: + name: just - name: Install toolchain shell: bash run: | diff --git a/.github/workflows/library-web.yml b/.github/workflows/library-web.yml index 3a986343..081a0926 100644 --- a/.github/workflows/library-web.yml +++ b/.github/workflows/library-web.yml @@ -30,8 +30,9 @@ jobs: - name: Setup binstall uses: ./.github/actions/setup-binstall - name: Install just - shell: bash - run: cargo binstall just + uses: ./.github/actions/cargo-install + with: + name: just - name: Install nightly toolchain shell: bash run: | diff --git a/.github/workflows/run-benchmarks.yml b/.github/workflows/run-benchmarks.yml index 6ca79ac3..699ee1de 100644 --- a/.github/workflows/run-benchmarks.yml +++ b/.github/workflows/run-benchmarks.yml @@ -12,8 +12,9 @@ jobs: - name: Setup binstall uses: ./.github/actions/setup-binstall - name: Install just - shell: bash - run: cargo binstall just + uses: ./.github/actions/cargo-install + with: + name: just - name: Install toolchain shell: bash run: | diff --git a/.github/workflows/run-checks.yml b/.github/workflows/run-checks.yml index f1ec0dae..a7ef2844 100644 --- a/.github/workflows/run-checks.yml +++ b/.github/workflows/run-checks.yml @@ -12,8 +12,9 @@ jobs: - name: Setup binstall uses: ./.github/actions/setup-binstall - name: Install just - shell: bash - run: cargo binstall just + uses: ./.github/actions/cargo-install + with: + name: just - name: Install toolchain shell: bash run: just stable-toolchain diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index e4754178..bbbaecf3 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -12,8 +12,9 @@ jobs: - name: Setup binstall uses: ./.github/actions/setup-binstall - name: Install just - shell: bash - run: cargo binstall just + uses: ./.github/actions/cargo-install + with: + name: just - name: Install toolchain shell: bash run: |