From 041645dca2a2f7b09089f700f8a95804257f2bc8 Mon Sep 17 00:00:00 2001
From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr>
Date: Thu, 16 Mar 2023 22:44:10 +0100
Subject: [PATCH] Force to use image with Conan 1 because all required packages
for building Python are not yet for Conan 2
---
.gitlab-ci.yml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d476e6e..a6aa9dd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
variables:
PYTHON_VERSION: "3.6.13"
- CONAN_DOCKER_VERSION: "1.59.0"
+ CONAN_DOCKER_TAG: "1-59-0"
stages:
- build
@@ -45,14 +45,14 @@ workflow:
linux-x86_64:
extends: [".build"]
- image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91:${CONAN_DOCKER_VERSION}
+ image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91:${CONAN_DOCKER_TAG}
variables:
NAME: "python-${PYTHON_VERSION}-linux-x86_64"
PYTHON_ROOT: "${CI_PROJECT_DIR}/${NAME}"
test-x86_64:
extends: [".test"]
- image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91:${CONAN_DOCKER_VERSION}
+ image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91:${CONAN_DOCKER_TAG}
variables:
NAME: "python-${PYTHON_VERSION}-linux-x86_64"
needs:
@@ -60,7 +60,7 @@ test-x86_64:
package-x86_64:
extends: [".package"]
- image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91:${CONAN_DOCKER_VERSION}
+ image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91:${CONAN_DOCKER_TAG}
variables:
NAME: "python-${PYTHON_VERSION}-linux-x86_64"
needs:
@@ -69,14 +69,14 @@ package-x86_64:
linux-i686:
extends: [".build"]
- image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91-x86:${CONAN_DOCKER_VERSION}
+ image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91-x86:${CONAN_DOCKER_TAG}
variables:
NAME: "python-${PYTHON_VERSION}-linux-i686"
PYTHON_ROOT: "${CI_PROJECT_DIR}/${NAME}"
test-i686:
extends: [".test"]
- image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91-x86:${CONAN_DOCKER_VERSION}
+ image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91-x86:${CONAN_DOCKER_TAG}
variables:
NAME: "python-${PYTHON_VERSION}-linux-i686"
needs:
@@ -84,7 +84,7 @@ test-i686:
package-i686:
extends: [".package"]
- image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91-x86:${CONAN_DOCKER_VERSION}
+ image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el6-gcc91-x86:${CONAN_DOCKER_TAG}
variables:
NAME: "python-${PYTHON_VERSION}-linux-i686"
needs:
--
GitLab