Codechange: [CI] Move Release CI build to MacOS runner (#12309)

This commit is contained in:
merni-ns 2024-03-16 19:41:23 +05:30 committed by GitHub
parent fe12d38024
commit 4c0dca1411
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 8 deletions

View File

@ -25,15 +25,10 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
include: include:
- name: Clang - Debug - name: Clang
compiler: clang-15 compiler: clang-15
cxxcompiler: clang++-15 cxxcompiler: clang++-15
libraries: libsdl2-dev libraries: libsdl2-dev
- name: Clang - Release
compiler: clang-15
cxxcompiler: clang++-15
libraries: libsdl2-dev
extra-cmake-parameters: -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPTION_USE_ASSERTS=OFF
- name: GCC - SDL2 - name: GCC - SDL2
compiler: gcc compiler: gcc
cxxcompiler: g++ cxxcompiler: g++
@ -61,10 +56,16 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
include: include:
- arch: arm64 - name: arm64 - Debug
arch: arm64
full_arch: arm64 full_arch: arm64
extra-cmake-parameters: -DCMAKE_BUILD=Debug
- name: arm64 - Release
arch: arm64
full_arch: arm64
extra-cmake-parameters: -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPTION_USE_ASSERTS=OFF
name: Mac OS (${{ matrix.arch }}) name: Mac OS (${{ matrix.name }})
uses: ./.github/workflows/ci-macos.yml uses: ./.github/workflows/ci-macos.yml
secrets: inherit secrets: inherit
@ -72,6 +73,7 @@ jobs:
with: with:
arch: ${{ matrix.arch }} arch: ${{ matrix.arch }}
full_arch: ${{ matrix.full_arch }} full_arch: ${{ matrix.full_arch }}
extra-cmake-parameters: ${{ matrix.extra-cmake-parameters }}
windows: windows:
strategy: strategy:

View File

@ -9,6 +9,10 @@ on:
full_arch: full_arch:
required: true required: true
type: string type: string
extra-cmake-parameters:
required: false
type: string
default: ""
env: env:
CTEST_OUTPUT_ON_FAILURE: 1 CTEST_OUTPUT_ON_FAILURE: 1
@ -66,6 +70,7 @@ jobs:
-DCMAKE_OSX_ARCHITECTURES=${{ inputs.full_arch }} \ -DCMAKE_OSX_ARCHITECTURES=${{ inputs.full_arch }} \
-DVCPKG_TARGET_TRIPLET=${{ inputs.arch }}-osx \ -DVCPKG_TARGET_TRIPLET=${{ inputs.arch }}-osx \
-DCMAKE_TOOLCHAIN_FILE=${{ runner.temp }}/vcpkg/scripts/buildsystems/vcpkg.cmake \ -DCMAKE_TOOLCHAIN_FILE=${{ runner.temp }}/vcpkg/scripts/buildsystems/vcpkg.cmake \
${{ inputs.extra-cmake-parameters }} \
# EOF # EOF
echo "::endgroup::" echo "::endgroup::"