Skip to content

Commit 39f5164

Browse files
authored
Update Conan client version to 2.9.3 (#619)
1 parent f073206 commit 39f5164

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

.ci/Jenkinsfile

-5
Original file line numberDiff line numberDiff line change
@@ -168,17 +168,12 @@ def getModernImages(String pr_number, String registry) {
168168
List<String> conanVersions = envValues["CONAN_VERSIONS"].split(",")
169169
conanVersions.each({ String conanVersion ->
170170
List<String> gccVersions = envValues["GCC_VERSIONS"].split(",").collect({String version -> return getVersionMajor(version)})
171-
List<String> clangVersions = envValues["CLANG_VERSIONS"].split(",").collect({String version -> return getVersionMajor(version)})
172171

173172
images.add(defineModernBaseImageData(envValues, pr_number, registry, conanVersion))
174173

175174
gccVersions.each({ String gccVersion ->
176175
images.addAll(defineModernImagesData("gcc", gccVersion, envValues, pr_number, registry, conanVersion))
177176
})
178-
179-
clangVersions.each({ String clangVersion ->
180-
images.addAll(defineModernImagesData("clang", clangVersion, envValues, pr_number, registry, conanVersion))
181-
})
182177
})
183178
}
184179
return images

images/.env

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
CONAN_VERSIONS=2.9.2
2-
CONAN_VERSION=2.9.2
1+
CONAN_VERSIONS=2.9.3
2+
CONAN_VERSION=2.9.3
33

4-
DOCKER_TAG=2.9.2
4+
DOCKER_TAG=2.9.3
55
DOCKER_USERNAME=conanio
66
DOCKERHUB_USERNAME=conanio
77

@@ -17,9 +17,6 @@ JAVA_JDK_VERSION=17
1717
GCC_VERSIONS=11.4.0
1818
GCC11_VERSION=11.4.0
1919

20-
CLANG_VERSIONS=13.0.1
21-
CLANG13_VERSION=13.0.1
22-
2320
DISTRO=ubuntu16.04
2421
DISTRO_VERSION=16.04
2522

0 commit comments

Comments
 (0)