mirror of
https://github.com/Kitware/CMake.git
synced 2026-05-07 06:40:16 -05:00
gitlab-ci: Simplify macOS packaging jobs
Run cpack in a post-build step instead of duplicating the job script.
This commit is contained in:
+2
-2
@@ -914,7 +914,7 @@ t:macos-arm64-xcode:
|
|||||||
b:macos-package:
|
b:macos-package:
|
||||||
extends:
|
extends:
|
||||||
- .macos_package
|
- .macos_package
|
||||||
- .cmake_build_macos_package
|
- .cmake_build_macos
|
||||||
- .cmake_release_artifacts
|
- .cmake_release_artifacts
|
||||||
- .macos_x86_64_tags_package
|
- .macos_x86_64_tags_package
|
||||||
- .run_only_for_package
|
- .run_only_for_package
|
||||||
@@ -937,7 +937,7 @@ u:macos-package:
|
|||||||
b:macos10.10-package:
|
b:macos10.10-package:
|
||||||
extends:
|
extends:
|
||||||
- .macos10.10_package
|
- .macos10.10_package
|
||||||
- .cmake_build_macos_package
|
- .cmake_build_macos
|
||||||
- .cmake_release_artifacts
|
- .cmake_release_artifacts
|
||||||
- .macos_x86_64_tags_package
|
- .macos_x86_64_tags_package
|
||||||
- .run_only_for_package
|
- .run_only_for_package
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
cd build
|
||||||
|
cpack -G TGZ
|
||||||
|
cpack -G DragNDrop
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
. .gitlab/ci/package_macos.sh
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
. .gitlab/ci/package_macos.sh
|
||||||
@@ -162,19 +162,6 @@
|
|||||||
|
|
||||||
interruptible: true
|
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:
|
.cmake_test_macos:
|
||||||
stage: test
|
stage: test
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user