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

Merge branch 'python-3.6.13' into 'main' 

Python 3.6.13

See merge request !1
parents cd5e51ac 2071edee
No related branches found
No related tags found
2 merge requests!4Update to Conan 1.59.0,!1Python 3.6.13
Pipeline #1708 passed
Stage: build
Stage: test
Stage: package
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 21
− 79
View file @ 64c93e6a
variables: variables:
CONAN_VERSION: "1.54.0" CONAN_VERSION: "1.55.0"
PYTHON_VERSION: "3.6.13" PYTHON_VERSION: "3.6.13"
workflow: workflow:
...@@ -18,7 +18,7 @@ stages: ...@@ -18,7 +18,7 @@ stages:
stage: build stage: build
script: script:
# Install python 3 # 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.13/download?job=${PLATFORM}
- unzip -q ${PYTHON_ROOT}.zip -d ${CI_PROJECT_DIR} - unzip -q ${PYTHON_ROOT}.zip -d ${CI_PROJECT_DIR}
- rm -f ${PYTHON_ROOT}.zip - rm -f ${PYTHON_ROOT}.zip
# Install conan # Install conan
...@@ -36,7 +36,7 @@ stages: ...@@ -36,7 +36,7 @@ stages:
stage: test stage: test
script: script:
# Install python 3 # 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.13/download?job=${PLATFORM}
- unzip -q ${PYTHON_ROOT}.zip -d ${CI_PROJECT_DIR} - unzip -q ${PYTHON_ROOT}.zip -d ${CI_PROJECT_DIR}
- rm ${PYTHON_ROOT}.zip - rm ${PYTHON_ROOT}.zip
# Test # Test
...@@ -51,117 +51,59 @@ stages: ...@@ -51,117 +51,59 @@ stages:
- zip -r --symlinks ../${CONAN_ROOT}.zip * - 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}"' - '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"] extends: [".build"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44 image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44
variables: variables:
PLATFORM: "linux-el6-x86_64" PLATFORM: "linux-x86_64"
CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}" CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}" PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
test-el6-x86_64: test-x86_64:
extends: [".test"] extends: [".test"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44 image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44
variables: variables:
PLATFORM: "linux-el6-x86_64" PLATFORM: "linux-x86_64"
CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}" CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}" PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
needs: needs:
- linux-el6-x86_64 - linux-x86_64
package-el6-x86_64: package-x86_64:
extends: [".package"] extends: [".package"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44 image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44
variables: variables:
PLATFORM: "linux-el6-x86_64" PLATFORM: "linux-x86_64"
CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}" CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
needs: needs:
- linux-el6-x86_64 - linux-x86_64
- test-el6-x86_64 - test-x86_64
linux-el6-i686: linux-i686:
extends: [".build"] extends: [".build"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44-x86 image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44-x86
variables: variables:
PLATFORM: "linux-el6-i686" PLATFORM: "linux-i686"
CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}" CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}" PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
test-el6-i686: test-i686:
extends: [".test"] extends: [".test"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44-x86 image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44-x86
variables: variables:
PLATFORM: "linux-el6-i686" PLATFORM: "linux-i686"
CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}" CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}" PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
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-gcc44-x86 image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44-x86
variables: variables:
PLATFORM: "linux-el6-i686" PLATFORM: "linux-i686"
CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}" CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}" PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
needs: needs:
- linux-el6-i686 - linux-i686
- test-el6-i686 - test-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
README.md 0 → 100644
+ 7
− 0
View file @ 64c93e6a
# Conan
Pipeline to create Conan package for Python 3.6.13.
Conan 1.55.0 for:
* Linux 32 bits: [conan-1.55.0-linux-python-3.6.13-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/python-3.6.13/download?job=linux-i686)
* Linux 64 bits: [conan-1.55.0-linux-python-3.6.13-x86_64.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/python-3.6.13//download?job=linux-x86_64)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

The place to be for your source code