From cff0086d4c4652e2f8077dc6d6cb04d552508f2e Mon Sep 17 00:00:00 2001 From: Joe Richey Date: Tue, 17 Aug 2021 13:44:25 -0700 Subject: [PATCH 1/4] ci: Use choco to install qemu Signed-off-by: Joe Richey --- .github/workflows/build.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7b60dba22..658c00edf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -133,14 +133,10 @@ jobs: HOMEBREW_NO_AUTO_UPDATE: 1 HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK: 1 HOMEBREW_NO_INSTALL_CLEANUP: 1 - - name: Install Scoop (Windows) - run: | - Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh') - echo "$HOME\scoop\shims" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - if: runner.os == 'Windows' - shell: pwsh - name: Install QEMU (Windows) - run: scoop install qemu + run: | + choco install qemu + echo "$Env:Programfiles\qemu" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append if: runner.os == 'Windows' shell: pwsh From aa0432fcda9c5ac1bc3197fa7f20de06459e0dd5 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Wed, 18 Aug 2021 08:28:16 +0200 Subject: [PATCH 2/4] Try to install version 6.0.0 on Windows --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 658c00edf..d4174d51b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -135,7 +135,7 @@ jobs: HOMEBREW_NO_INSTALL_CLEANUP: 1 - name: Install QEMU (Windows) run: | - choco install qemu + choco install qemu --version 6.0.0 echo "$Env:Programfiles\qemu" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append if: runner.os == 'Windows' shell: pwsh From 81dbd1a552946aecea294a3758a1f43a51d680d7 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Wed, 18 Aug 2021 08:35:32 +0200 Subject: [PATCH 3/4] Choco uses different version numbers for qemu --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d4174d51b..3cd566d8e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -135,7 +135,7 @@ jobs: HOMEBREW_NO_INSTALL_CLEANUP: 1 - name: Install QEMU (Windows) run: | - choco install qemu --version 6.0.0 + choco install qemu --version 2021.8.10 echo "$Env:Programfiles\qemu" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append if: runner.os == 'Windows' shell: pwsh From f64118de5aeb43e8e59030b827a5951f3b7f64d7 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Wed, 18 Aug 2021 08:42:59 +0200 Subject: [PATCH 4/4] Version 6.0.0 corresponds to release on 2021.5.5 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3cd566d8e..d99a2d820 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -135,7 +135,7 @@ jobs: HOMEBREW_NO_INSTALL_CLEANUP: 1 - name: Install QEMU (Windows) run: | - choco install qemu --version 2021.8.10 + choco install qemu --version 2021.5.5 echo "$Env:Programfiles\qemu" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append if: runner.os == 'Windows' shell: pwsh