From ac7d591c9bd3d5f3dca3cf9483d4f3b99ff1b36e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eike=20Ha=C3=9F?= <eike-hass@web.de>
Date: Thu, 10 Feb 2022 13:05:51 +0100
Subject: [PATCH] Use preinstalled 7-zip to avoid Scoop errors in CI (#649)

---
 .github/actions/rust/sccache/setup-sccache-windows/action.yml | 2 ++
 .github/workflows/build-and-test.yml                          | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/actions/rust/sccache/setup-sccache-windows/action.yml b/.github/actions/rust/sccache/setup-sccache-windows/action.yml
index 9c0a237635..c44f4d6db4 100644
--- a/.github/actions/rust/sccache/setup-sccache-windows/action.yml
+++ b/.github/actions/rust/sccache/setup-sccache-windows/action.yml
@@ -7,6 +7,8 @@ runs:
       shell: pwsh
       run: |
         Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
+        # use preinstalled 7-zip to avoid unreliable installs
+        scoop config '7ZIPEXTRACT_USE_EXTERNAL' $true
         scoop install sccache
         echo "${HOME}/scoop/apps/sccache/current" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
     
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 6a2dfeee27..decf6df6d1 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -12,7 +12,7 @@ on:
       - epic/*
     paths:
       - '.github/workflows/build-and-test.yml'
-      - '.github/actions'
+      - '.github/actions/**'
       - '**.rs'
       - '**.toml'