diff options
| author | Brad King <brad.king@kitware.com> | 2021-01-26 21:08:11 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-01-27 15:29:38 (GMT) |
| commit | 616bf0d2f033b1b8dcf59d4ec91fa0534d399d15 (patch) | |
| tree | e43d4ce8bf5dbd7e08815999378700254ff6fbb6 /Utilities | |
| parent | 227ca689a764b1e3d590d7d47c70769e3baaa846 (diff) | |
| download | CMake-616bf0d2f033b1b8dcf59d4ec91fa0534d399d15.zip CMake-616bf0d2f033b1b8dcf59d4ec91fa0534d399d15.tar.gz CMake-616bf0d2f033b1b8dcf59d4ec91fa0534d399d15.tar.bz2 | |
gitlab-ci: consolidate release and package job infrastructure
Use `linux_release` in names associated with building or testing
release-style binaries. Add a `.linux_package` helper to adjust
the release binary build behavior for package-specific jobs.
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/Release/linux/aarch64/Dockerfile | 2 | ||||
| -rw-r--r-- | Utilities/Release/linux/x86_64/Dockerfile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Utilities/Release/linux/aarch64/Dockerfile b/Utilities/Release/linux/aarch64/Dockerfile index fe9b02c..9abae2a 100644 --- a/Utilities/Release/linux/aarch64/Dockerfile +++ b/Utilities/Release/linux/aarch64/Dockerfile @@ -5,7 +5,7 @@ # Build using the CMake source directory as the build context. # The resulting image will have an '/out' directory containing the package. -# Keep this in sync with the `.gitlab-ci.yml` `release_linux` image. +# Keep this in sync with the `.gitlab/os-linux.yml` `.linux_release_aarch64` image. ARG FROM_IMAGE_NAME=kitware/cmake:build-linux-aarch64-deps-2020-12-21 ARG FROM_IMAGE_DIGEST=@sha256:0bd7dfe4e45593b04e39cd21e44011034610cfd376900558c5ef959bb1af15af ARG FROM_IMAGE=$FROM_IMAGE_NAME$FROM_IMAGE_DIGEST diff --git a/Utilities/Release/linux/x86_64/Dockerfile b/Utilities/Release/linux/x86_64/Dockerfile index b448108..8c98d3e 100644 --- a/Utilities/Release/linux/x86_64/Dockerfile +++ b/Utilities/Release/linux/x86_64/Dockerfile @@ -5,7 +5,7 @@ # Build using the CMake source directory as the build context. # The resulting image will have an '/out' directory containing the package. -# Keep this in sync with the `.gitlab-ci.yml` `release_linux` image. +# Keep this in sync with the `.gitlab/os-linux.yml` `.linux_release_x86_64` image. ARG FROM_IMAGE_NAME=kitware/cmake:build-linux-x86_64-deps-2020-04-02 ARG FROM_IMAGE_DIGEST=@sha256:77e9ab183f34680990db9da5945473e288f0d6556bce79ecc1589670d656e157 ARG FROM_IMAGE=$FROM_IMAGE_NAME$FROM_IMAGE_DIGEST |