diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2020-06-12 16:54:06 (GMT) |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2020-06-12 16:59:55 (GMT) |
| commit | 6d168c41e3bac2c6445977e957772772429d6fb1 (patch) | |
| tree | bd0f3af8290711d7c294e68f061681ff99480f9c /.gitlab-ci.yml | |
| parent | a1fe6ad62129c14e9dcae5c61d40bea55c81a497 (diff) | |
| download | CMake-6d168c41e3bac2c6445977e957772772429d6fb1.zip CMake-6d168c41e3bac2c6445977e957772772429d6fb1.tar.gz CMake-6d168c41e3bac2c6445977e957772772429d6fb1.tar.bz2 | |
gitlab-ci: split linux and macos shared before scripts
They're not actually the same anyways and the anchors can't be shared
between the files. We can figure out refactoring in the future.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f98f884..ec2393b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,6 @@ include: - local: .gitlab/artifacts.yml # OS builds. - - local: .gitlab/os-unix.yml - local: .gitlab/os-linux.yml - local: .gitlab/os-macos.yml - local: .gitlab/os-windows.yml @@ -35,21 +34,21 @@ stages: build:debian10-iwyu: extends: - .debian10_iwyu - - .cmake_build_unix + - .cmake_build_linux - .linux_builder_tags - .run_automatically build:fedora31-tidy: extends: - .fedora31_tidy - - .cmake_build_unix + - .cmake_build_linux - .linux_builder_tags_qt - .run_automatically build:fedora31-sphinx: extends: - .fedora31_sphinx - - .cmake_build_unix + - .cmake_build_linux - .linux_builder_tags_qt - .run_automatically @@ -88,7 +87,7 @@ test:cuda10.2-nvidia: build:fedora31-ninja: extends: - .fedora31_ninja - - .cmake_build_unix + - .cmake_build_linux - .cmake_build_artifacts - .linux_builder_tags_qt - .run_manually @@ -96,7 +95,7 @@ build:fedora31-ninja: test:fedora31-ninja: extends: - .fedora31_ninja - - .cmake_test_unix + - .cmake_test_linux - .linux_builder_tags_qt - .cmake_test_artifacts - .run_automatically @@ -121,7 +120,7 @@ test:fedora31-ninja-multi: build:macos-ninja: extends: - .macos_ninja - - .cmake_build_unix + - .cmake_build_macos - .cmake_build_artifacts - .macos_builder_tags - .run_manually @@ -129,7 +128,7 @@ build:macos-ninja: test:macos-ninja: extends: - .macos_ninja - - .cmake_test_unix + - .cmake_test_macos - .cmake_test_artifacts - .macos_builder_tags - .run_automatically @@ -141,7 +140,7 @@ test:macos-ninja: build:macos-makefiles: extends: - .macos_makefiles - - .cmake_build_unix + - .cmake_build_macos - .cmake_build_artifacts - .macos_builder_tags - .run_manually @@ -149,7 +148,7 @@ build:macos-makefiles: test:macos-makefiles: extends: - .macos_makefiles - - .cmake_test_unix + - .cmake_test_macos - .macos_builder_tags - .run_automatically dependencies: |