CI : use all Mac runners and fix signing identity with spaces.

This commit is contained in:
Julien Wadel 2023-09-26 09:51:52 +02:00
parent 5d01fe8ac3
commit dedda50d1c

View file

@ -18,13 +18,13 @@
echo $DEFAULT_MACOS_CMAKE_OPTIONS
echo $CMAKE_OPTIONS
echo $ADDITIONAL_BUILD_OPTIONS
cmake .. -G "$CMAKE_GENERATOR" -DLINPHONESDK_PLATFORM=Macos -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DCMAKE_BUILD_TYPE=$CI_BUILD_TYPE $DEFAULT_MACOS_CMAKE_OPTIONS -DLINPHONE_BUILDER_SIGNING_IDENTITY=$MACOS_SIGNING_IDENTITY $XCODE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS -DCMAKE_TOOLCHAIN_FILE=$CMAKE_TOOLCHAIN_FILE $RELEASE_FILE
cmake .. -G "$CMAKE_GENERATOR" -DLINPHONESDK_PLATFORM=Macos -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DCMAKE_BUILD_TYPE=$CI_BUILD_TYPE $DEFAULT_MACOS_CMAKE_OPTIONS -DLINPHONE_BUILDER_SIGNING_IDENTITY="$MACOS_SIGNING_IDENTITY" $XCODE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS -DCMAKE_TOOLCHAIN_FILE=$CMAKE_TOOLCHAIN_FILE $RELEASE_FILE
cmake --build . --target install --config $CI_BUILD_TYPE $LBC_NODEBUG_OPTIONS -- $ADDITIONAL_BUILD_OPTIONS
ccache -s
.job-macosx-desktop:
stage: build
tags: [ "macmini-m1-bis-xcode13" ]
tags: [ "macos-xcode13" ]
script:
- *build_all_script
variables:
@ -91,7 +91,7 @@ job-macosx-ninja-novideo:
# WAIT for QT6 for arm64
job-macosx-makefile-package:
stage: package
tags: [ "macmini-m1-bis-xcode13" ]
tags: [ "macos-xcode13" ]
dependencies: []
only:
variables:
@ -114,7 +114,7 @@ job-macosx-makefile-package:
job-macosx-codesigning:
stage: signing
tags: [ "macmini-m1-bis-xcode13" ]
tags: [ "macos-xcode13" ]
needs:
- job-macosx-makefile-package
only:
@ -139,7 +139,7 @@ job-macosx-codesigning:
job-macosx-makefile-deploy:
stage: deploy
tags: [ "macmini-m1-bis-xcode13" ]
tags: [ "macos-xcode13" ]
needs:
- job-macosx-codesigning
only:
@ -157,7 +157,7 @@ job-macosx-makefile-deploy:
job-macosx-makefile-plugins-deploy:
stage: deploy
tags: [ "macmini-m1-bis-xcode13" ]
tags: [ "macos-xcode13" ]
needs:
- job-macosx-makefile
only: