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

Update build using newest build of python

parent cd5e51ac
No related branches found
No related tags found
1 merge request!1Python 3.6.13
......@@ -18,7 +18,7 @@ stages:
stage: build
script:
# Install python 3
- curl -s -L -o ${PYTHON_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/python3/-/jobs/artifacts/main/download?job=${PLATFORM}
- curl -s -L -o ${PYTHON_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/python3/-/jobs/artifacts/3.6.3/download?job=${PLATFORM}
- unzip -q ${PYTHON_ROOT}.zip -d ${CI_PROJECT_DIR}
- rm -f ${PYTHON_ROOT}.zip
# Install conan
......@@ -36,7 +36,7 @@ stages:
stage: test
script:
# Install python 3
- curl -s -L -o ${PYTHON_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/python3/-/jobs/artifacts/main/download?job=${PLATFORM}
- curl -s -L -o ${PYTHON_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/python3/-/jobs/artifacts/3.6.3/download?job=${PLATFORM}
- unzip -q ${PYTHON_ROOT}.zip -d ${CI_PROJECT_DIR}
- rm ${PYTHON_ROOT}.zip
# Test
......@@ -51,117 +51,59 @@ stages:
- zip -r --symlinks ../${CONAN_ROOT}.zip *
- 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file ../${CONAN_ROOT}.zip "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/conan/${CONAN_VERSION}/${CONAN_ROOT}"'
linux-el6-x86_64:
linux-x86_64:
extends: [".build"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44
variables:
PLATFORM: "linux-el6-x86_64"
PLATFORM: "linux-x86_64"
CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
test-el6-x86_64:
test-x86_64:
extends: [".test"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44
variables:
PLATFORM: "linux-el6-x86_64"
PLATFORM: "linux-x86_64"
CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
needs:
- linux-el6-x86_64
- linux-x86_64
package-el6-x86_64:
package-x86_64:
extends: [".package"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44
variables:
PLATFORM: "linux-el6-x86_64"
PLATFORM: "linux-x86_64"
CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
needs:
- linux-el6-x86_64
- test-el6-x86_64
- linux-x86_64
- test-x86_64
linux-el6-i686:
linux-i686:
extends: [".build"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44-x86
variables:
PLATFORM: "linux-el6-i686"
PLATFORM: "linux-i686"
CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
test-el6-i686:
test-i686:
extends: [".test"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44-x86
variables:
PLATFORM: "linux-el6-i686"
PLATFORM: "linux-i686"
CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
needs:
- linux-el6-i686
- linux-i686
package-el6-i686:
package-i686:
extends: [".package"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44-x86
variables:
PLATFORM: "linux-el6-i686"
PLATFORM: "linux-i686"
CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
needs:
- linux-el6-i686
- test-el6-i686
linux-el7-x86_64:
extends: [".build"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el7-gcc48
variables:
PLATFORM: "linux-el7-x86_64"
CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
test-el7-x86_64:
extends: [".test"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el7-gcc48
variables:
PLATFORM: "linux-el7-x86_64"
CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
needs:
- linux-el7-x86_64
package-el7-x86_64:
extends: [".package"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44-x86
variables:
PLATFORM: "linux-el7-x86_64"
CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
needs:
- linux-el7-x86_64
- test-el7-x86_64
linux-el7-i686:
extends: [".build"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el7-gcc48-x86
variables:
PLATFORM: "linux-el7-i686"
CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
test-el7-i686:
extends: [".test"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el7-gcc48-x86
variables:
PLATFORM: "linux-el7-i686"
CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
needs:
- linux-el7-i686
package-el7-i686:
extends: [".package"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el7-gcc48-x86
variables:
PLATFORM: "linux-el7-i686"
CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
needs:
- linux-el7-i686
- test-el7-i686
\ No newline at end of file
- linux-i686
- test-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