From 8a73f4ebcd15d8d45b0a4ca82c0a707eed49f7c4 Mon Sep 17 00:00:00 2001 From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr> Date: Wed, 3 May 2023 14:40:09 +0200 Subject: [PATCH] Update to conan 2.0.4 --- .gitlab-ci.yml | 2 +- README.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 61bffa5..e0ed8b7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - CONAN_VERSION: "2.0.3" + CONAN_VERSION: "2.0.4" PYTHON_VERSION: "3.6.13" workflow: diff --git a/README.md b/README.md index a9208e2..28a91c4 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,6 @@ Pipeline to create Conan package -Conan 2.0.3 for: -* Linux 32 bits: [conan-2.0.3-linux-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.3/download?job=linux-i686) -* Linux 64 bits: [conan-2.0.3-linux-x86_64.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.0.3/download?job=linux-x86_64) +Conan 2.0.4 for: +* Linux 32 bits: [conan-2.0.4-linux-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.4/download?job=linux-i686) +* Linux 64 bits: [conan-2.0.4-linux-x86_64.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.0.4/download?job=linux-x86_64) -- GitLab