|
|
@@ -91,15 +91,15 @@ jobs:
|
|
|
extension: exe
|
|
|
before_install: msvc.sh
|
|
|
preset: windows-msvc-release-x86
|
|
|
- #- platform: msvc-arm64
|
|
|
- # arch: arm64
|
|
|
- # os: windows-11-arm
|
|
|
- # test: 0
|
|
|
- # pack: 0
|
|
|
- # pack_type: RelWithDebInfo
|
|
|
- # extension: exe
|
|
|
- # before_install: msvc.sh
|
|
|
- # preset: windows-msvc-release-arm64
|
|
|
+ - platform: msvc-arm64
|
|
|
+ arch: arm64
|
|
|
+ os: windows-11-arm
|
|
|
+ test: 0
|
|
|
+ pack: 0
|
|
|
+ pack_type: RelWithDebInfo
|
|
|
+ extension: exe
|
|
|
+ before_install: msvc.sh
|
|
|
+ preset: windows-msvc-release-arm64
|
|
|
- platform: mingw_x86_64
|
|
|
os: ubuntu-24.04
|
|
|
test: 0
|
|
|
@@ -169,7 +169,7 @@ jobs:
|
|
|
# fall back to ccache of the vcmi/vcmi repo if no PR-specific ccache is found
|
|
|
- name: ccache for PRs
|
|
|
uses: hendrikmuhs/[email protected]
|
|
|
- if: ${{ github.event.number != '' }}
|
|
|
+ if: ${{ github.event.number != '' && !startsWith(matrix.platform, 'msvc') }}
|
|
|
with:
|
|
|
key: ${{ matrix.preset }}-PR-${{ github.event.number }}
|
|
|
restore-keys: |
|
|
|
@@ -181,7 +181,7 @@ jobs:
|
|
|
|
|
|
- name: ccache for everything but PRs
|
|
|
uses: hendrikmuhs/[email protected]
|
|
|
- if: ${{ (github.repository == 'vcmi/vcmi' && github.event.number == '' && (github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/beta' || github.ref == 'refs/heads/master')) || github.repository != 'vcmi/vcmi' }}
|
|
|
+ if: ${{ (!startsWith(matrix.platform, 'msvc')) && (github.repository == 'vcmi/vcmi' && github.event.number == '' && (github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/beta' || github.ref == 'refs/heads/master')) || github.repository != 'vcmi/vcmi' }}
|
|
|
with:
|
|
|
key: ${{ matrix.preset }}-no-PR
|
|
|
restore-keys: |
|
|
|
@@ -311,7 +311,7 @@ jobs:
|
|
|
"${{ env.VCMI_PACKAGE_BUILD }}"
|
|
|
"${{ matrix.arch }}"
|
|
|
"VCMI ${{ env.VCMI_PACKAGE_NAME_SUFFIX }}"
|
|
|
- "${{ env.VCMI_PACKAGE_FILE_NAME }}"
|
|
|
+ "${{ env.VCMI_PACKAGE_FILE_NAME }}-${{ matrix.arch }}"
|
|
|
"${{ github.workspace }}\out\build\${{ matrix.preset }}\bin\RelWithDebInfo"
|
|
|
"${{ github.workspace }}\ucrt"
|
|
|
shell: cmd
|