]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
CI: install mingw and set correct path
authorMartin Matuska <martin@matuska.de>
Sat, 9 Dec 2023 23:53:32 +0000 (00:53 +0100)
committerMartin Matuska <martin@matuska.de>
Sun, 10 Dec 2023 00:01:28 +0000 (01:01 +0100)
.github/workflows/ci.yml
build/ci/github_actions/ci.cmd

index 0bf347174b21e2f663961ded337cff9d5134eaaf..d613a758069840d8b66f0c2720353cd04b54dc47 100644 (file)
@@ -124,7 +124,11 @@ jobs:
         be: [mingw-gcc, msvc]
     steps:
     - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
-    - name: Install dependencies
+    - name: Install mingw
+      if:  ${{ matrix.be=='mingw-gcc' }}
+      run: choco install mingw
+      shell: cmd
+    - name: Install library dependencies
       run: ./build/ci/github_actions/ci.cmd deplibs
       shell: cmd
       env:
index ac1a276017d0ec8d417f1624fd8a099a549baa4b..56b47399ed93d30e51fdf47cc066c385318a0986 100755 (executable)
@@ -12,7 +12,7 @@ IF NOT "%BE%"=="mingw-gcc" (
 
 SET ORIGPATH=%PATH%
 IF "%BE%"=="mingw-gcc" (
-  SET MINGWPATH=C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\Program Files\cmake\bin;C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin
+  SET MINGWPATH=C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\Program Files\cmake\bin;C:\ProgramData\mingw64\mingw64\bin
 )
 
 IF "%1"=="deplibs" (