mirror of
https://github.com/vcmi/vcmi.git
synced 2025-11-25 22:42:04 +02:00
Disable ARM64 again, add Inno Setup check
This commit is contained in:
26
.github/workflows/github.yml
vendored
26
.github/workflows/github.yml
vendored
@@ -91,15 +91,15 @@ jobs:
|
|||||||
extension: exe
|
extension: exe
|
||||||
before_install: msvc.sh
|
before_install: msvc.sh
|
||||||
preset: windows-msvc-release-x86
|
preset: windows-msvc-release-x86
|
||||||
- platform: msvc-arm64
|
#- platform: msvc-arm64
|
||||||
arch: arm64
|
# arch: arm64
|
||||||
os: windows-11-arm
|
# os: windows-11-arm
|
||||||
test: 0
|
# test: 0
|
||||||
pack: 0
|
# pack: 0
|
||||||
pack_type: RelWithDebInfo
|
# pack_type: RelWithDebInfo
|
||||||
extension: exe
|
# extension: exe
|
||||||
before_install: msvc.sh
|
# before_install: msvc.sh
|
||||||
preset: windows-msvc-release-arm64
|
# preset: windows-msvc-release-arm64
|
||||||
- platform: mingw_x86_64
|
- platform: mingw_x86_64
|
||||||
os: ubuntu-24.04
|
os: ubuntu-24.04
|
||||||
test: 0
|
test: 0
|
||||||
@@ -295,6 +295,14 @@ jobs:
|
|||||||
echo "Waiting..."; counter=0; while pgrep XProtect && ((counter < 20)); do sleep 3; ((counter++)); done
|
echo "Waiting..."; counter=0; while pgrep XProtect && ((counter < 20)); do sleep 3; ((counter++)); done
|
||||||
pgrep XProtect || true
|
pgrep XProtect || true
|
||||||
|
|
||||||
|
- name: Ensure Inno Setup is installed
|
||||||
|
if: ${{ startsWith(matrix.platform, 'msvc') }}
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
if [ ! -f "/c/Program Files (x86)/Inno Setup 6/ISCC.exe" ] && [ ! -f "/c/ProgramData/Chocolatey/bin/ISCC.exe" ]; then
|
||||||
|
choco install innosetup --no-progress -y
|
||||||
|
fi
|
||||||
|
|
||||||
- name: Build VCMI Installer
|
- name: Build VCMI Installer
|
||||||
if: ${{ startsWith(matrix.platform, 'msvc') }}
|
if: ${{ startsWith(matrix.platform, 'msvc') }}
|
||||||
run: >
|
run: >
|
||||||
|
|||||||
Reference in New Issue
Block a user