diff options
| author | Brad King <brad.king@kitware.com> | 2023-02-28 15:15:24 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-02-28 15:18:31 (GMT) |
| commit | ce2e8253069fa1e5750b800a19f85c6e3b359bd8 (patch) | |
| tree | 3c7054a1df5caa9373198b257fba0471f8ec802a | |
| parent | 05531a7c4e499847b7d174fb7697e840c223bc98 (diff) | |
| download | CMake-ce2e8253069fa1e5750b800a19f85c6e3b359bd8.zip CMake-ce2e8253069fa1e5750b800a19f85c6e3b359bd8.tar.gz CMake-ce2e8253069fa1e5750b800a19f85c6e3b359bd8.tar.bz2 | |
gitlab-ci: Simplify macOS packaging jobs
Run cpack in a post-build step instead of duplicating the job script.
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | .gitlab/ci/package_macos.sh | 3 | ||||
| -rw-r--r-- | .gitlab/ci/post_build_macos10.10_package.sh | 1 | ||||
| -rw-r--r-- | .gitlab/ci/post_build_macos_package.sh | 1 | ||||
| -rw-r--r-- | .gitlab/os-macos.yml | 13 |
5 files changed, 7 insertions, 15 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 87a75e8..af1dc6c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/.gitlab/ci/package_macos.sh b/.gitlab/ci/package_macos.sh new file mode 100644 index 0000000..f5c178c --- /dev/null +++ b/.gitlab/ci/package_macos.sh @@ -0,0 +1,3 @@ +cd build +cpack -G TGZ +cpack -G DragNDrop diff --git a/.gitlab/ci/post_build_macos10.10_package.sh b/.gitlab/ci/post_build_macos10.10_package.sh new file mode 100644 index 0000000..3b7bc72 --- /dev/null +++ b/.gitlab/ci/post_build_macos10.10_package.sh @@ -0,0 +1 @@ +. .gitlab/ci/package_macos.sh diff --git a/.gitlab/ci/post_build_macos_package.sh b/.gitlab/ci/post_build_macos_package.sh new file mode 100644 index 0000000..3b7bc72 --- /dev/null +++ b/.gitlab/ci/post_build_macos_package.sh @@ -0,0 +1 @@ +. .gitlab/ci/package_macos.sh diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index ff77e1d..652a67a 100644 --- a/.gitlab/os-macos.yml +++ b/.gitlab/os-macos.yml @@ -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 |