Skip to content
Snippets Groups Projects
Commit 7809e008 authored by MADELA Patrick's avatar MADELA Patrick
Browse files

Update to cmake 3.25.1 and remove specific build for CentOS 7

parent 736944d3
No related branches found
No related tags found
No related merge requests found
Pipeline #1494 passed
variables: variables:
PREBUILD_CMAKE_VERSION: 3.18.2 PREBUILD_CMAKE_VERSION: 3.18.2
CMAKE_VERSION: 3.24.2 CMAKE_VERSION: 3.25.1
workflow:
rules:
- if: $CI_PIPELINE_SOURCE == "schedule"
- if: $CI_PIPELINE_SOURCE == "web"
- if: $CI_COMMIT_TAG
stages: stages:
- prebuild - prebuild
...@@ -61,66 +67,35 @@ stages: ...@@ -61,66 +67,35 @@ stages:
- zip -r --symlinks ../${NAME}.zip * - zip -r --symlinks ../${NAME}.zip *
- 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file ../${NAME}.zip "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/cmake/${CMAKE_VERSION}/"' - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file ../${NAME}.zip "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/cmake/${CMAKE_VERSION}/"'
prebuild-el6-i686: prebuild-i686:
extends: [".prebuild"] extends: [".prebuild"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc73-x86 image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc73-x86
variables: variables:
NAME: "cmake-${PREBUILD_CMAKE_VERSION}-linux-el6-i686" NAME: "cmake-${PREBUILD_CMAKE_VERSION}-linux-i686"
linux-el6-i686: linux-i686:
extends: [".build"] extends: [".build"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc73-x86 image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc73-x86
variables: variables:
PREBUILD_NAME: "cmake-${PREBUILD_CMAKE_VERSION}-linux-el6-i686" PREBUILD_NAME: "cmake-${PREBUILD_CMAKE_VERSION}-linux-i686"
NAME: "cmake-${CMAKE_VERSION}-linux-el6-i686" NAME: "cmake-${CMAKE_VERSION}-linux-i686"
needs: needs:
- prebuild-el6-i686 - prebuild-i686
test-el6-i686: test-i686:
extends: [".test"] extends: [".test"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc73-x86 image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc73-x86
variables: variables:
NAME: "cmake-${CMAKE_VERSION}-linux-el6-i686" NAME: "cmake-${CMAKE_VERSION}-linux-i686"
needs: needs:
- linux-el6-i686 - linux-i686
package-el6-i686: package-i686:
extends: [".package"] extends: [".package"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc73-x86 image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc73-x86
variables: variables:
NAME: "cmake-${CMAKE_VERSION}-linux-el6-i686" NAME: "cmake-${CMAKE_VERSION}-linux-i686"
needs:
- linux-el6-i686
- test-el6-i686
prebuild-el7-i686:
extends: [".prebuild"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el7-gcc73-x86
variables:
NAME: "cmake-${PREBUILD_CMAKE_VERSION}-linux-el7-i686"
linux-el7-i686:
extends: [".build"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el7-gcc73-x86
variables:
PREBUILD_NAME: "cmake-${PREBUILD_CMAKE_VERSION}-linux-el7-i686"
NAME: "cmake-${CMAKE_VERSION}-linux-el7-i686"
needs: needs:
- prebuild-el7-i686 - linux-i686
- test-i686
test-el7-i686:
extends: [".test"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el7-gcc73-x86
variables:
NAME: "cmake-${CMAKE_VERSION}-linux-el7-i686"
needs:
- linux-el7-i686
package-el7-i686:
extends: [".package"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el7-gcc73-x86
variables:
NAME: "cmake-${CMAKE_VERSION}-linux-el7-i686"
needs:
- linux-el7-i686
- test-el7-i686
...@@ -2,9 +2,8 @@ ...@@ -2,9 +2,8 @@
Pipeline to build recent version of Cmake for our legacy CentOS 32 bits platform. Pipeline to build recent version of Cmake for our legacy CentOS 32 bits platform.
Cmake provides independent 64 bits Linux distribution that works on CentOS 6 and 7 64 bits but they are not available for 32 bits: Cmake provides independent 64 bits Linux distribution that works on CentOS 6 64 bits but they are not available for 32 bits:
* https://cmake.org/files/v3.24.2/cmake-3.24.2-Linux-x86_64.tar.gz * https://cmake.org/files/v3.25/cmake-3.25.1-linux-x86_64.tar.gz
Allows to build Cmake for: Allows to build Cmake for:
* CentOS 6.10 32 bits: [cmake-3.24.2-linux-el6-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/main/download?job=linux-el6-i686) * CentOS 6.10 32 bits: [cmake-3.25.1-linux-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.25.1/download?job=linux-i686)
* CentOS 7.9 32 bits: [cmake-3.24.2-linux-el7-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/main/download?job=linux-el7-i686)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment