diff options
| author | Brad King <brad.king@kitware.com> | 2023-02-28 10:15:24 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-02-28 10:18:31 -0500 |
| commit | ce2e8253069fa1e5750b800a19f85c6e3b359bd8 (patch) | |
| tree | 3c7054a1df5caa9373198b257fba0471f8ec802a /.gitlab | |
| parent | 05531a7c4e499847b7d174fb7697e840c223bc98 (diff) | |
| download | cmake-ce2e8253069fa1e5750b800a19f85c6e3b359bd8.tar.gz | |
gitlab-ci: Simplify macOS packaging jobs
Run cpack in a post-build step instead of duplicating the job script.
Diffstat (limited to '.gitlab')
| -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 |
4 files changed, 5 insertions, 13 deletions
diff --git a/.gitlab/ci/package_macos.sh b/.gitlab/ci/package_macos.sh new file mode 100644 index 0000000000..f5c178c20d --- /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 0000000000..3b7bc72f38 --- /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 0000000000..3b7bc72f38 --- /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 ff77e1d2b3..652a67abb0 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 |