gitlab-ci: Simplify macOS packaging jobs

Run cpack in a post-build step instead of duplicating the job script.
This commit is contained in:
Brad King 2023-02-28 10:15:24 -05:00
parent 05531a7c4e
commit ce2e825306
5 changed files with 7 additions and 15 deletions

View File

@ -914,7 +914,7 @@ t:macos-arm64-xcode:
b:macos-package:
extends:
- .macos_package
- .cmake_build_macos_package
- .cmake_build_macos
- .cmake_release_artifacts
- .macos_x86_64_tags_package
- .run_only_for_package
@ -937,7 +937,7 @@ u:macos-package:
b:macos10.10-package:
extends:
- .macos10.10_package
- .cmake_build_macos_package
- .cmake_build_macos
- .cmake_release_artifacts
- .macos_x86_64_tags_package
- .run_only_for_package

View File

@ -0,0 +1,3 @@
cd build
cpack -G TGZ
cpack -G DragNDrop

View File

@ -0,0 +1 @@
. .gitlab/ci/package_macos.sh

View File

@ -0,0 +1 @@
. .gitlab/ci/package_macos.sh

View File

@ -162,19 +162,6 @@
interruptible: true
.cmake_build_macos_package:
stage: build
script:
- *before_script_macos
- ctest -VV -S .gitlab/ci/ctest_configure.cmake
- ctest -VV -S .gitlab/ci/ctest_build.cmake
- cd build
- cpack -G TGZ
- cpack -G DragNDrop
interruptible: true
.cmake_test_macos:
stage: test