From 62e3bc63ef5b009198171bd215afbef39a07b54f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Tue, 19 May 2026 13:59:19 +0300
Subject: [PATCH] github: Use 7z instead of Expand-Archive

7z is included in the list of officially supported/included
applications on the Github Actions Windows images, so we can
rely on it.

This can be significantly faster than the Expand-Archive command,
see e.g. https://github.com/PowerShell/PowerShell/issues/3355.
---
 .github/workflows/build.yml       | 8 ++++----
 .github/workflows/test-libcxx.yml | 2 +-
 .github/workflows/test-llvm.yml   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 10baafc..ccd631d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -469,7 +469,7 @@ jobs:
           name: windows-ucrt-${{matrix.arch}}-toolchain
       - name: Unpack toolchain
         run: |
-          Expand-Archive llvm-mingw-*.zip -DestinationPath .
+          7z x llvm-mingw-*.zip
           del llvm-mingw-*.zip
           mv llvm-mingw-* c:\llvm-mingw
           echo "c:\llvm-mingw\busybox\bin" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append
@@ -510,7 +510,7 @@ jobs:
           name: windows-ucrt-${{matrix.arch}}-toolchain
       - name: Unpack toolchain
         run: |
-          Expand-Archive llvm-mingw-*.zip -DestinationPath .
+          7z x llvm-mingw-*.zip
           del llvm-mingw-*.zip
           mv llvm-mingw-* c:\llvm-mingw
           echo "c:\llvm-mingw\bin" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append
@@ -570,7 +570,7 @@ jobs:
           name: windows-ucrt-${{matrix.arch == 'arm64ec' && 'aarch64' || matrix.arch}}-toolchain
       - name: Unpack toolchain
         run: |
-          Expand-Archive llvm-mingw-*.zip -DestinationPath .
+          7z x llvm-mingw-*.zip
           del llvm-mingw-*.zip
           mv llvm-mingw-* c:\llvm-mingw
           echo "c:\llvm-mingw\bin" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append
@@ -634,7 +634,7 @@ jobs:
           name: windows-ucrt-${{matrix.arch}}-toolchain
       - name: Unpack toolchain
         run: |
-          Expand-Archive llvm-mingw-*.zip -DestinationPath .
+          7z x llvm-mingw-*.zip
           del llvm-mingw-*.zip
           mv llvm-mingw-* c:\llvm-mingw
           echo "c:\llvm-mingw\bin" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append
diff --git a/.github/workflows/test-libcxx.yml b/.github/workflows/test-libcxx.yml
index d2ec492..a4bb112 100644
--- a/.github/workflows/test-libcxx.yml
+++ b/.github/workflows/test-libcxx.yml
@@ -59,7 +59,7 @@ jobs:
           name: windows-ucrt-${{matrix.arch}}-toolchain
       - name: Unpack toolchain
         run: |
-          Expand-Archive llvm-mingw-*.zip -DestinationPath .
+          7z x llvm-mingw-*.zip
           del llvm-mingw-*.zip
           mv llvm-mingw-* c:\llvm-mingw
           echo "c:\llvm-mingw\bin" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append
diff --git a/.github/workflows/test-llvm.yml b/.github/workflows/test-llvm.yml
index bd6a589..01697b2 100644
--- a/.github/workflows/test-llvm.yml
+++ b/.github/workflows/test-llvm.yml
@@ -58,7 +58,7 @@ jobs:
           name: windows-ucrt-${{matrix.arch}}-toolchain
       - name: Unpack toolchain
         run: |
-          Expand-Archive llvm-mingw-*.zip -DestinationPath .
+          7z x llvm-mingw-*.zip
           del llvm-mingw-*.zip
           mv llvm-mingw-* c:\llvm-mingw
           echo "c:\llvm-mingw\bin" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append