From 38b4d437f3d43b49b9513d6f7bb83d8686eb31f9 Mon Sep 17 00:00:00 2001
From: Federico Terzi <federicoterzi96@gmail.com>
Date: Sat, 11 Dec 2021 16:31:57 +0100
Subject: [PATCH] fix(ci): install explicit rust-script version to mitigate CI
 failure: https://github.com/fornwall/rust-script/issues/42

---
 .github/workflows/ci.yml      | 9 ++++++---
 .github/workflows/release.yml | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b881035..f910d58 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,8 +33,9 @@ jobs:
           cargo clippy -- -D warnings
         env:
           MACOSX_DEPLOYMENT_TARGET: "10.13"
-      - name: Install cargo-make
+      - name: Install rust-script and cargo-make
         run: |
+          cargo install rust-script --version "0.7.0"
           cargo install --force cargo-make --version 0.34.0
       - name: Run test suite
         run: cargo make test-binary
@@ -58,8 +59,9 @@ jobs:
         run: |
           rustup component add clippy
           cargo clippy -p espanso --features wayland -- -D warnings
-      - name: Install cargo-make
+      - name: Install rust-script and cargo-make
         run: |
+          cargo install rust-script --version "0.7.0"
           cargo install --force cargo-make --version 0.34.0
       - name: Run test suite
         run: cargo make test-binary --env NO_X11=true
@@ -72,8 +74,9 @@ jobs:
       - uses: actions/checkout@v2
       - name: Install target
         run: rustup update && rustup target add aarch64-apple-darwin
-      - name: Install cargo-make
+      - name: Install rust-script and cargo-make
         run: |
+          cargo install rust-script --version "0.7.0"
           cargo install --force cargo-make --version 0.34.0
       - name: Build
         run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9674a1f..974040b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -59,8 +59,9 @@ jobs:
       - name: Print target version
         run: |
           echo Using version ${{ needs.extract-version.outputs.espanso_version }}
-      - name: Install cargo-make
+      - name: Install rust-script and cargo-make
         run: |
+          cargo install rust-script --version "0.7.0"
           cargo install --force cargo-make --version 0.34.0
       - name: Test
         run: cargo make test-binary --profile release
@@ -126,8 +127,9 @@ jobs:
       - name: Print target version
         run: |
           echo Using version ${{ needs.extract-version.outputs.espanso_version }}
-      - name: Install cargo-make
+      - name: Install rust-script and cargo-make
         run: |
+          cargo install rust-script --version "0.7.0"
           cargo install --force cargo-make --version 0.34.0
       - name: Test
         run: cargo make test-binary --profile release
@@ -166,8 +168,9 @@ jobs:
           echo Using version ${{ needs.extract-version.outputs.espanso_version }}
       - name: Install rust target
         run: rustup update && rustup target add aarch64-apple-darwin
-      - name: Install cargo-make
+      - name: Install rust-script and cargo-make
         run: |
+          cargo install rust-script --version "0.7.0"
           cargo install --force cargo-make --version 0.34.0
       - name: Build
         run: cargo make create-bundle --profile release --env BUILD_ARCH=aarch64-apple-darwin