jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-14 22:42:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

use build matrix variables: package_suffix

Browse source 
simplifying some convoluted logic, one variable at a time.  work in progress.
This commit is contained in:
Bruno Alexandre Rosa 2025-10-29 10:23:48 -03:00
parent 5cca21b6c8
commit a8b2f58435
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -250,8 +250,9 @@ jobs:
soc: Intel soc: Intel
xcode: "16.4" xcode: "16.4"
type: Release type: Release
make_package: 1
override_target: 13 override_target: 13
make_package: 1
package_suffix: "-macOS13_Intel"
- os: macOS - os: macOS
target: 14 target: 14
@ -260,6 +261,7 @@ jobs:
xcode: "15.4" xcode: "15.4"
type: Release type: Release
make_package: 1 make_package: 1
package_suffix: "-macOS14"
- os: macOS - os: macOS
target: 15 target: 15
@ -268,6 +270,7 @@ jobs:
xcode: "16.4" xcode: "16.4"
type: Release type: Release
make_package: 1 make_package: 1
package_suffix: "-macOS15"
- os: macOS - os: macOS
target: 15 target: 15
@ -275,17 +278,20 @@ jobs:
soc: Apple soc: Apple
xcode: "16.4" xcode: "16.4"
type: Debug type: Debug
package_suffix: "-macOS15_Debug"
- os: Windows - os: Windows
target: 7 target: 7
runner: windows-2022 runner: windows-2022
make_package: 1 make_package: 1
package_suffix: "-Win7"
qt_version: 5.15.* qt_version: 5.15.*
- os: Windows - os: Windows
target: 10 target: 10
runner: windows-2022 runner: windows-2022
make_package: 1 make_package: 1
package_suffix: "-Win10"
qt_version: 6.6.* qt_version: 6.6.*
name: ${{ matrix.os }} ${{ matrix.target }}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} name: ${{ matrix.os }} ${{ matrix.target }}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }}
@ -339,14 +345,12 @@ jobs:
- name: Configure macOS - name: Configure macOS
if: matrix.os == 'macOS' if: matrix.os == 'macOS'
run: | run: |
echo "PACKAGE_SUFFIX=-macOS${{ matrix.target }}${{ matrix.soc == 'Intel' && '_Intel' || '' }}${{ matrix.type == 'Debug' && '_Debug' || '' }}" >> $GITHUB_ENV
echo "ARTIFACT_NAME=${{ matrix.os }}${{ matrix.target }}${{ matrix.soc == 'Intel' && '_Intel' || '' }}${{ matrix.type == 'Debug' && '_Debug' || '' }}-package" >> $GITHUB_ENV echo "ARTIFACT_NAME=${{ matrix.os }}${{ matrix.target }}${{ matrix.soc == 'Intel' && '_Intel' || '' }}${{ matrix.type == 'Debug' && '_Debug' || '' }}-package" >> $GITHUB_ENV
- name: Configure Windows - name: Configure Windows
if: matrix.os == 'Windows' if: matrix.os == 'Windows'
shell: bash # needs to be bash to export environment variables via GITHUB_ENV shell: bash # needs to be bash to export environment variables via GITHUB_ENV
run: | run: |
echo "PACKAGE_SUFFIX=-Win${{ matrix.target }}" >> $GITHUB_ENV
echo "ARTIFACT_NAME=${{ matrix.os }}${{ matrix.target }}-installer" >> $GITHUB_ENV echo "ARTIFACT_NAME=${{ matrix.os }}${{ matrix.target }}-installer" >> $GITHUB_ENV
# uses environment variables, see compile.sh for more details # uses environment variables, see compile.sh for more details
@ -356,6 +360,7 @@ jobs:
env: env:
BUILDTYPE: '${{ matrix.type }}' BUILDTYPE: '${{ matrix.type }}'
MAKE_PACKAGE: '${{ matrix.make_package }}' MAKE_PACKAGE: '${{ matrix.make_package }}'
PACKAGE_SUFFIX: '${{ matrix.package_suffix }}'
CMAKE_GENERATOR: ${{ matrix.os == 'macOS' && 'Ninja' || 'Visual Studio 17 2022' }} CMAKE_GENERATOR: ${{ matrix.os == 'macOS' && 'Ninja' || 'Visual Studio 17 2022' }}
CMAKE_GENERATOR_PLATFORM: ${{ matrix.os == 'Windows' && 'x64' || '' }} CMAKE_GENERATOR_PLATFORM: ${{ matrix.os == 'Windows' && 'x64' || '' }}
USE_CCACHE: ${{ matrix.os == 'macOS' && '1' || '' }} USE_CCACHE: ${{ matrix.os == 'macOS' && '1' || '' }}