jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-12 09:04:53 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Do check runner OS rather than relying on custom matrix for OS-specific steps

Browse source
This commit is contained in:
tooomm 2026-04-12 14:13:08 +02:00 • committed by GitHub
parent 271358790a
commit c3c8a459ac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
.github/workflows/desktop-build.yml vendored
View file

@ -349,7 +349,7 @@ jobs:
submodules: recursive submodules: recursive
- name: Add msbuild to PATH - name: Add msbuild to PATH
if: matrix.os == 'Windows' if: runner.os == 'Windows'
uses: microsoft/setup-msbuild@v3 uses: microsoft/setup-msbuild@v3
with: with:
msbuild-architecture: x64 msbuild-architecture: x64
@ -379,7 +379,7 @@ jobs:
run: .ci/resolve_latest_aqt_qt_version.sh "${{ env.QT_VERSION }}" run: .ci/resolve_latest_aqt_qt_version.sh "${{ env.QT_VERSION }}"
- name: Restore thin Qt ${{ steps.resolve_qt_version.outputs.version }} libraries (${{ matrix.soc }} macOS) - name: Restore thin Qt ${{ steps.resolve_qt_version.outputs.version }} libraries (${{ matrix.soc }} macOS)
if: matrix.os == 'macOS' if: runner.os == 'macOS'
id: restore_qt id: restore_qt
uses: actions/cache/restore@v5 uses: actions/cache/restore@v5
with: with:
@ -389,7 +389,7 @@ jobs:
# Using jurplel/install-qt-action to install Qt without using brew # Using jurplel/install-qt-action to install Qt without using brew
# qt build using vcpkg either just fails or takes too long to build # qt build using vcpkg either just fails or takes too long to build
- name: Install fat Qt ${{ steps.resolve_qt_version.outputs.version }} (${{ matrix.soc }} macOS) - name: Install fat Qt ${{ steps.resolve_qt_version.outputs.version }} (${{ matrix.soc }} macOS)
if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true' if: runner.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true'
uses: jurplel/install-qt-action@v4 uses: jurplel/install-qt-action@v4
with: with:
version: ${{ steps.resolve_qt_version.outputs.version }} version: ${{ steps.resolve_qt_version.outputs.version }}
@ -399,18 +399,18 @@ jobs:
dir: ${{github.workspace}} dir: ${{github.workspace}}
- name: Thin Qt libraries (${{ matrix.soc }} macOS) - name: Thin Qt libraries (${{ matrix.soc }} macOS)
if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true' if: runner.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true'
run: .ci/thin_macos_qtlib.sh run: .ci/thin_macos_qtlib.sh
- name: Cache thin Qt libraries (${{ matrix.soc }} macOS) - name: Cache thin Qt libraries (${{ matrix.soc }} macOS)
if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true' if: runner.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true'
uses: actions/cache/save@v5 uses: actions/cache/save@v5
with: with:
path: ${{ github.workspace }}/Qt path: ${{ github.workspace }}/Qt
key: thin-qt-macos-${{ matrix.soc }}-${{ steps.resolve_qt_version.outputs.version }} key: thin-qt-macos-${{ matrix.soc }}-${{ steps.resolve_qt_version.outputs.version }}
- name: Install Qt ${{ steps.resolve_qt_version.outputs.version }} (Windows) - name: Install Qt ${{ steps.resolve_qt_version.outputs.version }} (Windows)
if: matrix.os == 'Windows' if: runner.os == 'Windows'
uses: jurplel/install-qt-action@v4 uses: jurplel/install-qt-action@v4
with: with:
# Qt 6.11.0 only works with aqtinstall directly from git until aqtinstall 3.4 is released # Qt 6.11.0 only works with aqtinstall directly from git until aqtinstall 3.4 is released
@ -421,7 +421,7 @@ jobs:
cache: true cache: true
- name: Install NSIS - name: Install NSIS
if: matrix.os == 'Windows' if: runner.os == 'Windows'
shell: bash shell: bash
run: choco install nsis run: choco install nsis
@ -472,7 +472,7 @@ jobs:
key: ${{ steps.ccache_restore.outputs.cache-primary-key }} key: ${{ steps.ccache_restore.outputs.cache-primary-key }}
- name: Sign app bundle - name: Sign app bundle
if: matrix.os == 'macOS' && matrix.make_package && needs.configure.outputs.tag != null if: runner.os == 'macOS' && matrix.make_package && needs.configure.outputs.tag != null
id: sign_macos id: sign_macos
env: env:
MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }} MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}
@ -526,7 +526,7 @@ jobs:
if-no-files-found: error if-no-files-found: error
- name: Upload PDBs (Program Databases) - name: Upload PDBs (Program Databases)
if: matrix.os == 'Windows' && github.ref_type != 'tag' if: runner.os == 'Windows' && github.ref_type != 'tag'
uses: actions/upload-artifact@v7 uses: actions/upload-artifact@v7
with: with:
name: ${{steps.build.outputs.name}}-PDBs name: ${{steps.build.outputs.name}}-PDBs