mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2026-10-22 19:43:21 +00:00
Fix ProxSpace CI for tagged commits
MSYS2 git fails with
C:\ProxSpace\msys2\usr\bin\git.exe rev-parse refs/tags/v4.23346^{commit}
Error: fatal: ambiguous argument 'refs/tags/v4.23346^commit': unknown revision or path not in the working tr
GitHub's windows-latest hosted runner images ship with Git, so let's use it
This commit is contained in:
1 file changed
+13
-1
@@ -23,7 +23,6 @@ jobs:
|
||||
run:
|
||||
shell: pwsh
|
||||
env:
|
||||
PATH: C:/ProxSpace/msys2/ucrt64/bin;C:/ProxSpace/msys2/usr/local/bin;C:/ProxSpace/msys2/usr/bin;C:/ProxSpace/msys2/bin
|
||||
MSYSTEM: UCRT64
|
||||
PYTHONHOME: /ucrt64
|
||||
|
||||
@@ -107,6 +106,19 @@ jobs:
|
||||
|
||||
- uses: actions/checkout@v6
|
||||
|
||||
# Prepend MSYS2 tools to PATH only for steps after checkout, so actions/checkout
|
||||
# keeps using the runner's native git (MSYS2's git.exe mangles refs like
|
||||
# 'tag^{commit}' due to its own bash-style argv reparsing).
|
||||
- name: Add ProxSpace/MSYS2 to PATH
|
||||
run: |
|
||||
Add-Content -Path $env:GITHUB_PATH -Value "C:\ProxSpace\msys2\ucrt64\bin"
|
||||
Add-Content -Path $env:GITHUB_PATH -Value "C:\ProxSpace\msys2\usr\local\bin"
|
||||
Add-Content -Path $env:GITHUB_PATH -Value "C:\ProxSpace\msys2\usr\bin"
|
||||
Add-Content -Path $env:GITHUB_PATH -Value "C:\ProxSpace\msys2\bin"
|
||||
# Not set by an MSYS2 login shell here, so pkg-config wouldn't otherwise
|
||||
# find the ucrt64 .pc files (zlib, jansson, gdlib, python3, etc).
|
||||
Add-Content -Path $env:GITHUB_ENV -Value "PKG_CONFIG_PATH=/ucrt64/lib/pkgconfig:/ucrt64/share/pkgconfig"
|
||||
|
||||
# TODO workaround: "error: linker script file 'xxxx' appears multiple times"
|
||||
# This should be reverted once MSYS2 ships a non-broken version of the linker.
|
||||
- name: Downgrade ARM linker (Windows, temporary)
|
||||
|
||||
Reference in new issue
Block a user