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

Update to Conan 1.55.0

parent 8f086db2
No related branches found
No related tags found
No related merge requests found
Pipeline #1641 passed
Pipeline: conan-docker-tools

#1657

    Pipeline: conan-docker-tools

    #1656

      Pipeline: conan-docker-tools

      #1655

        +13
        Showing
        with 21 additions and 21 deletions
        ......@@ -3,7 +3,7 @@
        Based on https://github.com/conan-io/conan-docker-tools to build Docker images for Soleil environments
        All images include:
        - Conan 1.54.0 with Python 3.6.13
        - Conan 1.55.0 with Python 3.6.13
        - Cmake 3.25.1
        - Git 2.38.1
        ......@@ -49,7 +49,7 @@ docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy
        ### To build image without docker-compose with specific version of Conan
        ```
        $ docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy --build-arg CONAN_VERSION=1.54.0 -t conan-el6-gcc44 -f conan-el6-gcc44/Dockerfile .
        $ docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy --build-arg CONAN_VERSION=1.55.0 -t conan-el6-gcc44 -f conan-el6-gcc44/Dockerfile .
        ```
        ## Launch
        ......
        ......@@ -31,7 +31,7 @@ test:
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.55.0"
        release:
        stage: release
        ......
        ......@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
        LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
        ARG PYTHON_VERSION=3.6.13 \
        CONAN_VERSION=1.54.0 \
        CONAN_VERSION=1.55.0 \
        CMAKE_VERSION=3.25.1 \
        GIT_VERSION=2.38.1 \
        DEVTOOLS_ROOT=/usr/Local/devtools \
        ......
        ......@@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im
        Image includes:
        - Python 3.6.13
        - Conan 1.54.0
        - Conan 1.55.0
        - Cmake 3.25.1
        - Git 2.38.1
        ......
        ......@@ -31,7 +31,7 @@ test:
        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1"
        - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1"
        - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0"
        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.55.0"
        release:
        stage: release
        ......
        ......@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
        LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
        ARG PYTHON_VERSION=3.6.13 \
        CONAN_VERSION=1.54.0 \
        CONAN_VERSION=1.55.0 \
        CMAKE_VERSION=3.25.1 \
        GIT_VERSION=2.38.1 \
        DEVTOOLS_ROOT=/usr/Local/devtools \
        ......
        ......@@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im
        Image includes:
        - Python 3.6.13
        - Conan 1.54.0
        - Conan 1.55.0
        - Cmake 3.25.1
        - Git 2.38.1
        ......
        ......@@ -30,7 +30,7 @@ test:
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.55.0"
        release:
        stage: release
        ......
        ......@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
        LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
        ARG PYTHON_VERSION=3.6.13 \
        CONAN_VERSION=1.54.0 \
        CONAN_VERSION=1.55.0 \
        CMAKE_VERSION=3.25.1 \
        GIT_VERSION=2.38.1 \
        DEVTOOLS_ROOT=/usr/Local/devtools \
        ......
        ......@@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im
        Image includes:
        - Python 3.6.13
        - Conan 1.54.0
        - Conan 1.55.0
        - Cmake 3.25.1
        - Git 2.38.1
        ......
        ......@@ -30,7 +30,7 @@ test:
        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1"
        - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1"
        - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0"
        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.55.0"
        release:
        stage: release
        ......
        ......@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
        LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
        ARG PYTHON_VERSION=3.6.13 \
        CONAN_VERSION=1.54.0 \
        CONAN_VERSION=1.55.0 \
        CMAKE_VERSION=3.25.1 \
        GIT_VERSION=2.38.1 \
        DEVTOOLS_ROOT=/usr/Local/devtools \
        ......
        ......@@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im
        Image includes:
        - Python 3.6.13
        - Conan 1.54.0
        - Conan 1.55.0
        - Cmake 3.25.1
        - Git 2.38.1
        ......
        ......@@ -30,7 +30,7 @@ test:
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.55.0"
        release:
        stage: release
        ......
        ......@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
        LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
        ARG PYTHON_VERSION=3.6.13 \
        CONAN_VERSION=1.54.0 \
        CONAN_VERSION=1.55.0 \
        CMAKE_VERSION=3.25.1 \
        GIT_VERSION=2.38.1 \
        DEVTOOLS_ROOT=/usr/Local/devtools \
        ......
        ......@@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im
        Image includes:
        - Python 3.6.13
        - Conan 1.54.0
        - Conan 1.55.0
        - Cmake 3.25.1
        - Git 2.38.1
        ......
        ......@@ -30,7 +30,7 @@ test:
        - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1"
        - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1"
        - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0"
        - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "1.55.0"
        release:
        stage: release
        ......
        ......@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
        LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
        ARG PYTHON_VERSION=3.6.13 \
        CONAN_VERSION=1.54.0 \
        CONAN_VERSION=1.55.0 \
        CMAKE_VERSION=3.25.1 \
        GIT_VERSION=2.38.1 \
        DEVTOOLS_ROOT=/usr/Local/devtools \
        ......
        ......@@ -4,7 +4,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Conan Docker im
        Image includes:
        - Python 3.6.13
        - Conan 1.54.0
        - Conan 1.55.0
        - Cmake 3.25.1
        - Git 2.38.1
        ......
        ......@@ -30,7 +30,7 @@ test:
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.25.1"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.38.1"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.54.0"
        - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "1.55.0"
        release:
        stage: release
        ......
        0% Loading or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Please register or to comment