summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-12-22 01:31:34 (GMT)
committerBrad King <brad.king@kitware.com>2020-12-22 19:04:39 (GMT)
commit595551a8053f5f466fd84e09ea6d855656708344 (patch)
tree3292a62dcc6ee566cad1047bf150a4b3eeecb91c
parent3e05e26296fc506b9deef357708a48dac8598d33 (diff)
downloadCMake-595551a8053f5f466fd84e09ea6d855656708344.zip
CMake-595551a8053f5f466fd84e09ea6d855656708344.tar.gz
CMake-595551a8053f5f466fd84e09ea6d855656708344.tar.bz2
gitlab-ci: consolidate Linux release package job spec for x86_64
-rw-r--r--.gitlab/os-linux.yml9
1 files changed, 2 insertions, 7 deletions
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index c69302a..57e4ae1 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -17,17 +17,12 @@
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
-.linux_package:
- variables:
- GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
- LAUNCHER: "scl enable devtoolset-6 rh-python36 --"
-
.linux_package_x86_64:
- extends: .linux_package
-
image: "kitware/cmake:build-linux-x86_64-deps-2020-04-02@sha256:77e9ab183f34680990db9da5945473e288f0d6556bce79ecc1589670d656e157"
variables:
+ GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
+ LAUNCHER: "scl enable devtoolset-6 rh-python36 --"
CMAKE_ARCH: x86_64
### Debian