From 8ed1c451f6ba248ea306e21ac43297a2a4b730e8 Mon Sep 17 00:00:00 2001 From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr> Date: Wed, 7 Feb 2024 12:30:16 +0100 Subject: [PATCH] Update .gitlab-ci.yml file to build x86_64 platform --- .gitlab-ci.yml | 49 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 44 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 420bd54..b6a065b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -70,31 +70,70 @@ prebuild-i686: extends: [".prebuild"] image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc73-x86 variables: - NAME: "cmake-${PREBUILD_CMAKE_VERSION}-linux-i686" - + PLATFORM: linux-i686 + NAME: "cmake-${PREBUILD_CMAKE_VERSION}-${PLATFORM}" + +prebuild-x86_64: + extends: [".prebuild"] + image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc73 + variables: + PLATFORM: linux-x86_64 + NAME: "cmake-${PREBUILD_CMAKE_VERSION}-${PLATFORM}" + linux-i686: extends: [".build"] image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc73-x86 variables: + PLATFORM: linux-i686 PREBUILD_NAME: "cmake-${PREBUILD_CMAKE_VERSION}-linux-i686" - NAME: "cmake-${CMAKE_VERSION}-linux-i686" + NAME: "cmake-${CMAKE_VERSION}-${PLATFORM}" needs: - prebuild-i686 +linux-x86_64: + extends: [".build"] + image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc73 + variables: + PLATFORM: linux-x86_64 + PREBUILD_NAME: "cmake-${PREBUILD_CMAKE_VERSION}-linux-x86_64" + NAME: "cmake-${CMAKE_VERSION}-${PLATFORM}" + needs: + - prebuild-x86_64 + test-i686: extends: [".test"] image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc73-x86 variables: - NAME: "cmake-${CMAKE_VERSION}-linux-i686" + PLATFORM: linux-i686 + NAME: "cmake-${CMAKE_VERSION}-${PLATFORM}" needs: - linux-i686 +test-x86_64: + extends: [".test"] + image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc73 + variables: + PLATFORM: linux-x86_64 + NAME: "cmake-${CMAKE_VERSION}-${PLATFORM}" + needs: + - linux-x86_64 + package-i686: extends: [".package"] image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc73-x86 variables: - NAME: "cmake-${CMAKE_VERSION}-linux-i686" + PLATFORM: linux-i686 + NAME: "cmake-${CMAKE_VERSION}-${PLATFORM}" needs: - linux-i686 - test-i686 +package-x86_64: + extends: [".package"] + image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc73 + variables: + PLATFORM: linux-x86_64 + NAME: "cmake-${CMAKE_VERSION}-${PLATFORM}" + needs: + - linux-x86_64 + - test-x86_64 \ No newline at end of file -- GitLab