diff options
| author | Brad King <brad.king@kitware.com> | 2020-12-22 14:04:59 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-12-22 14:04:59 -0500 |
| commit | 24247155af675b94238ff61967c8a359ce0f0160 (patch) | |
| tree | ac4a01414951cba1dee25bec0a092ed2075d33bb /.gitlab | |
| parent | 7340fd823f8b3d978ebba1ecb606ddc25deb3e9b (diff) | |
| parent | e14fb01c4149d3206dc87586101b233400a1ceba (diff) | |
| download | cmake-24247155af675b94238ff61967c8a359ce0f0160.tar.gz | |
Merge branch 'backport-rel-linux-aarch64' into rel-linux-aarch64
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/os-linux.yml | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 6684d71c8f..c32a40b558 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 |