diff options
| author | Nikhil Dabas <ndabas@gmail.com> | 2026-09-18 13:24:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-09-18 13:24:13 +0100 |
| commit | 2018586035126b790223d0aa820952f123fe3e81 (patch) | |
| tree | e71221cee89a553ac8045ec9e0bd46df233e6ee8 /.github/actions/setup-msys2/action.yml | |
| parent | cd7c501ed7bfb74cb88f074ae7e624d11444c6b1 (diff) | |
Fix linking failures on Windows/MSYS2 (#135)
Fixes #132. My hypothesis is that the link errors were caused by `libjq`
being built with the MSYS2 toolchain while the extension was linked by
the mingw-w64 shipped in the runner image at `C:\mingw64`. The fix is
simply to prepend the MSYS2 environment's `bin` directory to the `PATH`
unconditionally.
Diffstat (limited to '.github/actions/setup-msys2/action.yml')
| -rw-r--r-- | .github/actions/setup-msys2/action.yml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/.github/actions/setup-msys2/action.yml b/.github/actions/setup-msys2/action.yml index 86093bd..35bd777 100644 --- a/.github/actions/setup-msys2/action.yml +++ b/.github/actions/setup-msys2/action.yml @@ -7,12 +7,11 @@ runs: steps: - name: Set up MSYS2 id: set-up-msys2 - uses: msys2/setup-msys2@v2.27.0 + uses: msys2/setup-msys2@v2 with: msystem: ${{ inputs.arch == 'x86' && 'mingw32' || 'ucrt64' }} install: make mingw-w64-${{ inputs.arch == 'x86' && 'i686' || 'ucrt-x86_64' }}-gcc patch - - name: Set PATH for x86 - if: ${{ inputs.arch == 'x86' }} + - name: Add MSYS2 toolchain to PATH shell: msys2 {0} - run: echo "${{ steps.set-up-msys2.outputs.msys2-location }}/mingw32/bin" >> "$GITHUB_PATH" + run: echo "${{ steps.set-up-msys2.outputs.msys2-location }}/${MSYSTEM,,}/bin" >> "$GITHUB_PATH" |