Migrate from MINGW64 to UCRT64 as arm-none-eabi-gcc is not available anymore in MINGW64
cf https://github.com/msys2/MINGW-packages/commit/bb4125054bf0a400c77a64adb07b64658554083b
This commit is contained in:
5 files changed
+61
-17
No files matched your search
@@ -23,9 +23,9 @@ jobs:
|
||||
run:
|
||||
shell: pwsh
|
||||
env:
|
||||
PATH: C:/ProxSpace/msys2/mingw64/bin;C:/ProxSpace/msys2/usr/local/bin;C:/ProxSpace/msys2/usr/bin;C:/ProxSpace/msys2/bin
|
||||
MSYSTEM: MINGW64
|
||||
PYTHONHOME: /mingw64
|
||||
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
|
||||
|
||||
steps:
|
||||
- name: ProxSpace download
|
||||
@@ -40,6 +40,53 @@ jobs:
|
||||
- name: ProxSpace rename folder
|
||||
run: Get-ChildItem -Path "C:\ProxSpace-*" | Rename-Item -NewName (Split-Path C:\ProxSpace -Leaf)
|
||||
|
||||
- name: ProxSpace overwrite packages.txt for UCRT64
|
||||
run: |
|
||||
@'
|
||||
##############################
|
||||
# General #
|
||||
##############################
|
||||
git
|
||||
make
|
||||
pkg-config
|
||||
mingw-w64-ucrt-x86_64-cmake
|
||||
procps
|
||||
base-devel
|
||||
##############################
|
||||
# Proxmark3 #
|
||||
##############################
|
||||
mingw-w64-ucrt-x86_64-gcc
|
||||
mingw-w64-ucrt-x86_64-arm-none-eabi-gcc
|
||||
mingw-w64-ucrt-x86_64-arm-none-eabi-gdb
|
||||
mingw-w64-ucrt-x86_64-arm-none-eabi-binutils
|
||||
mingw-w64-ucrt-x86_64-arm-none-eabi-newlib
|
||||
mingw-w64-ucrt-x86_64-readline
|
||||
mingw-w64-ucrt-x86_64-libsndfile
|
||||
mingw-w64-ucrt-x86_64-lua
|
||||
mingw-w64-ucrt-x86_64-bzip2
|
||||
mingw-w64-ucrt-x86_64-python
|
||||
mingw-w64-ucrt-x86_64-python-pip
|
||||
mingw-w64-ucrt-x86_64-python-setuptools
|
||||
mingw-w64-ucrt-x86_64-python-cryptography
|
||||
mingw-w64-ucrt-x86_64-jansson
|
||||
mingw-w64-ucrt-x86_64-qt6-base
|
||||
mingw-w64-ucrt-x86_64-gdb
|
||||
mingw-w64-ucrt-x86_64-openocd
|
||||
mingw-w64-ucrt-x86_64-opencl-icd
|
||||
mingw-w64-ucrt-x86_64-lz4
|
||||
mingw-w64-ucrt-x86_64-libgd
|
||||
mingw-w64-ucrt-x86_64-openssl
|
||||
##############################
|
||||
# ChameleonMini #
|
||||
##############################
|
||||
#mingw-w64-ucrt-x86_64-dfu-programmer
|
||||
#mingw-w64-ucrt-x86_64-avrdude
|
||||
#mingw-w64-ucrt-x86_64-avr-binutils
|
||||
#mingw-w64-ucrt-x86_64-avr-gcc
|
||||
#mingw-w64-ucrt-x86_64-avr-gdb
|
||||
#mingw-w64-ucrt-x86_64-avr-libc
|
||||
'@ | Set-Content -Path "C:\ProxSpace\setup\packages.txt" -Encoding UTF8
|
||||
|
||||
- name: ProxSpace version
|
||||
run: |
|
||||
$psversion = (Select-String -Pattern 'PSVERSION=' -SimpleMatch -Path "C:\ProxSpace\setup\09-proxspace_setup.post").Line.Split("""")[1]
|
||||
@@ -53,10 +100,7 @@ jobs:
|
||||
for ($i = 1; $i -le $maxAttempts; $i++) {
|
||||
Write-Host "Attempt $i..."
|
||||
./runme64.bat -c "exit"
|
||||
if ($LASTEXITCODE -eq 0) {
|
||||
./runme64.bat -c "pacman -Syu --noconfirm mingw-w64-x86_64-qt6-base"
|
||||
exit 0
|
||||
}
|
||||
if ($LASTEXITCODE -eq 0) { exit 0 }
|
||||
if ($i -lt $maxAttempts) { Start-Sleep -Seconds $delay }
|
||||
}
|
||||
exit 1
|
||||
|
||||
Reference in new issue
Block a user