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

Add other platforms

parent b9035bb3
No related branches found
No related tags found
No related merge requests found
Pipeline #1085 passed
Stage: build
Stage: test
Stage: package
Hide whitespace changes
Inline Side-by-side
Showing
with 88 additions and 80 deletions
.gitlab-ci.yml
+ 88
− 80
View file @ 56411336
...@@ -43,7 +43,7 @@ stages: ...@@ -43,7 +43,7 @@ stages:
script: script:
- cd ${CI_PROJECT_DIR}/${CONAN_ROOT} - cd ${CI_PROJECT_DIR}/${CONAN_ROOT}
- 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}/"' - '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-el6-x86_64:
extends: [".build"] extends: [".build"]
...@@ -60,7 +60,6 @@ test-el6-x86_64: ...@@ -60,7 +60,6 @@ test-el6-x86_64:
PLATFORM: "linux-el6-x86_64" PLATFORM: "linux-el6-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-el6-x86_64
...@@ -69,85 +68,94 @@ package-el6-x86_64: ...@@ -69,85 +68,94 @@ package-el6-x86_64:
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44 image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44
variables: variables:
PLATFORM: "linux-el6-x86_64" PLATFORM: "linux-el6-x86_64"
NAME: "conan-${CONAN_VERSION}-${PLATFORM}" CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
needs: needs:
- linux-el6-x86_64 - linux-el6-x86_64
- test-el6-x86_64 - test-el6-x86_64
# linux-el6-i686: linux-el6-i686:
# extends: [".build"] extends: [".build"]
# image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86 image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86
# variables: variables:
# PLATFORM: "linux-el6-i686" PLATFORM: "linux-el6-i686"
# NAME: "conan-${GIT_VERSION}-${PLATFORM}" CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
# test-el6-i686:
# extends: [".test"] test-el6-i686:
# image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86 extends: [".test"]
# variables: image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86
# PLATFORM: "linux-el6-i686" variables:
# NAME: "conan-${GIT_VERSION}-${PLATFORM}" PLATFORM: "linux-el6-i686"
# needs: CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
# - linux-el6-i686 PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
needs:
# package-el6-i686: - linux-el6-i686
# extends: [".package"]
# image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86 package-el6-i686:
# variables: extends: [".package"]
# PLATFORM: "linux-el6-i686" image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86
# NAME: "conan-${GIT_VERSION}-${PLATFORM}" variables:
# needs: PLATFORM: "linux-el6-i686"
# - linux-el6-i686 CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
# - test-el6-i686 PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
needs:
# linux-el7-x86_64: - linux-el6-i686
# extends: [".build"] - test-el6-i686
# image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48
# variables: linux-el7-x86_64:
# PLATFORM: "linux-el6-i686" extends: [".build"]
# NAME: "conan-${GIT_VERSION}-${PLATFORM}" image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48
variables:
# test-el7-x86_64: PLATFORM: "linux-el7-x86_64"
# extends: [".test"] CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
# image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48 PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
# variables:
# PLATFORM: "linux-el6-i686" test-el7-x86_64:
# NAME: "conan-${GIT_VERSION}-${PLATFORM}" extends: [".test"]
# needs: image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48
# - linux-el7-x86_64 variables:
PLATFORM: "linux-el7-x86_64"
# package-el7-x86_64: CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
# extends: [".package"] PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
# image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86 needs:
# variables: - linux-el7-x86_64
# PLATFORM: "linux-el6-i686"
# NAME: "conan-${GIT_VERSION}-${PLATFORM}" package-el7-x86_64:
# needs: extends: [".package"]
# - linux-el7-x86_64 image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86
# - test-el7-x86_64 variables:
PLATFORM: "linux-el7-x86_64"
# linux-el7-i686: CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
# extends: [".build"] PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
# image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86 needs:
# variables: - linux-el7-x86_64
# PLATFORM: "linux-el6-i686" - test-el7-x86_64
# NAME: "conan-${GIT_VERSION}-${PLATFORM}"
linux-el7-i686:
# test-el7-i686: extends: [".build"]
# extends: [".test"] image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86
# image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86 variables:
# variables: PLATFORM: "linux-el7-i686"
# PLATFORM: "linux-el6-i686" CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
# NAME: "conan-${GIT_VERSION}-${PLATFORM}" PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
# needs:
# - linux-el7-i686 test-el7-i686:
extends: [".test"]
# package-el7-i686: image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86
# extends: [".package"] variables:
# image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86 PLATFORM: "linux-el7-i686"
# variables: CONAN_ROOT: "conan-${CONAN_VERSION}-${PLATFORM}"
# PLATFORM: "linux-el6-i686" PYTHON_ROOT: "python-${PYTHON_VERSION}-${PLATFORM}"
# NAME: "conan-${GIT_VERSION}-${PLATFORM}" needs:
# needs: - linux-el7-i686
# - linux-el7-i686
# - test-el7-i686 package-el7-i686:
\ No newline at end of file extends: [".package"]
image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/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
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