From 2f4f9a7e4fd6fc7cafd4519e1c90bcc1851d0a2e Mon Sep 17 00:00:00 2001 From: Martin Matuska Date: Sun, 10 Dec 2023 00:53:32 +0100 Subject: [PATCH] CI: install mingw and set correct path --- .github/workflows/ci.yml | 6 +++++- build/ci/github_actions/ci.cmd | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0bf347174..d613a7580 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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: diff --git a/build/ci/github_actions/ci.cmd b/build/ci/github_actions/ci.cmd index ac1a27601..56b47399e 100755 --- a/build/ci/github_actions/ci.cmd +++ b/build/ci/github_actions/ci.cmd @@ -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" ( -- 2.47.2