diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5c9207ec7425953344f3f4797e29af152dceacdf..388c1806205081bfd402ec8afafd5091d3417fbc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ variables: - GIT_VERSION: "2.39.2" + GIT_VERSION: "2.40.0" PYTHON_VERSION: "3.10.8" DEFAULT_HELP_FORMAT: "man" diff --git a/README.md b/README.md index fd4110f836fc216cc7b1d307c08c8c1874d3e107..eec3073bd09265aec95e1d3eb953003b133f006d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Git -Pipeline to build Git 2.39.2 with conan on our legacy CentOS 6. +Pipeline to build Git 2.40.0 with conan on our legacy CentOS 6. -Git 2.39.2 for: -* Linux 64 bits: [git-2.39.2-linux-x86_64.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64) -* Linux 32 bits: [git-2.39.2-linux-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-i686) +Git 2.40.0 for: +* Linux 64 bits: [git-2.40.0-linux-x86_64.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.40.0/download?job=linux-x86_64) +* Linux 32 bits: [git-2.40.0-linux-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.40.0/download?job=linux-i686) diff --git a/conanfile.py b/conanfile.py index 234ef6a2201a29280a4998bc5732917538b2bc0d..106c0a262342b8e3195cbc7cb8eb2f67ddb8dcf0 100644 --- a/conanfile.py +++ b/conanfile.py @@ -7,7 +7,7 @@ import os class GitConan(ConanFile): name = "git" - version = "2.39.2" + version = "2.40.0" settings = "os", "compiler", "build_type", "arch"