Skip to content

Commit f872372

Browse files
authored
GH-45381: [CI][Packaging][Conan] Use the latest supported image (#45387)
### Rationale for this change Conan 1 is deprecated. We should use Conan 2. ### What changes are included in this PR? Use "conania/gcc11-ubuntu16.04:2.12.1" because it's the latest version. Based on https://github.com/conan-io/conan-docker-tools/blob/master/images/README.md#official-docker-images, "gcc11-ubuntu16.04" is only supported image. `ci/conan/` is synchronized with the latest https://github.com/conan-io/conan-center-index . ### Are these changes tested? Yes. ### Are there any user-facing changes? No. * GitHub Issue: #45381 Authored-by: Sutou Kouhei <[email protected]> Signed-off-by: Sutou Kouhei <[email protected]>
1 parent 42b84bd commit f872372

24 files changed

+358
-1928
lines changed

Diff for: .env

+2-2
Original file line numberDiff line numberDiff line change
@@ -101,5 +101,5 @@ PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION=2025-01-27
101101
# Use conanio/${CONAN_BASE}:{CONAN_VERSION} for "docker compose run --rm conan".
102102
# See https://github.com/conan-io/conan-docker-tools#readme and
103103
# https://hub.docker.com/u/conanio for available images.
104-
CONAN_BASE=gcc10
105-
CONAN_VERSION=1.62.0
104+
CONAN_BASE=gcc11-ubuntu16.04
105+
CONAN_VERSION=2.12.1

Diff for: ci/conan/all/conandata.yml

+28-45
Original file line numberDiff line numberDiff line change
@@ -21,64 +21,47 @@
2121
# SOFTWARE.
2222

2323
sources:
24+
"18.1.0":
25+
url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-18.1.0/apache-arrow-18.1.0.tar.gz?action=download"
26+
sha256: "2dc8da5f8796afe213ecc5e5aba85bb82d91520eff3cf315784a52d0fa61d7fc"
27+
"18.0.0":
28+
url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-18.0.0/apache-arrow-18.0.0.tar.gz?action=download"
29+
sha256: "abcf1934cd0cdddd33664e9f2d9a251d6c55239d1122ad0ed223b13a583c82a9"
30+
"17.0.0":
31+
url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-17.0.0/apache-arrow-17.0.0.tar.gz?action=download"
32+
sha256: "9d280d8042e7cf526f8c28d170d93bfab65e50f94569f6a790982a878d8d898d"
33+
"16.1.0":
34+
url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-16.1.0/apache-arrow-16.1.0.tar.gz?action=download"
35+
sha256: "c9e60c7e87e59383d21b20dc874b17153729ee153264af6d21654b7dff2c60d7"
2436
"15.0.0":
2537
url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-15.0.0/apache-arrow-15.0.0.tar.gz?action=download"
2638
sha256: "01dd3f70e85d9b5b933ec92c0db8a4ef504a5105f78d2d8622e84279fb45c25d"
2739
"14.0.2":
2840
url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-14.0.2/apache-arrow-14.0.2.tar.gz?action=download"
2941
sha256: "1304dedb41896008b89fe0738c71a95d9b81752efc77fa70f264cb1da15d9bc2"
30-
"14.0.1":
31-
url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-14.0.1/apache-arrow-14.0.1.tar.gz?action=download"
32-
sha256: "5c70eafb1011f9d124bafb328afe54f62cc5b9280b7080e1e3d668f78c0e407e"
33-
"14.0.0":
34-
url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-14.0.0/apache-arrow-14.0.0.tar.gz?action=download"
35-
sha256: "4eb0da50ec071baf15fc163cb48058931e006f1c862c8def0e180fd07d531021"
36-
"13.0.0":
37-
url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-13.0.0/apache-arrow-13.0.0.tar.gz?action=download"
38-
sha256: "35dfda191262a756be934eef8afee8d09762cad25021daa626eb249e251ac9e6"
39-
"12.0.1":
40-
url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-12.0.1/apache-arrow-12.0.1.tar.gz?action=download"
41-
sha256: "3481c411393aa15c75e88d93cf8315faf7f43e180fe0790128d3840d417de858"
42-
"12.0.0":
43-
url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-12.0.0/apache-arrow-12.0.0.tar.gz?action=download"
44-
sha256: "ddd8347882775e53af7d0965a1902b7d8fcd0a030fd14f783d4f85e821352d52"
45-
"11.0.0":
46-
url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-11.0.0/apache-arrow-11.0.0.tar.gz?action=download"
47-
sha256: "2dd8f0ea0848a58785628ee3a57675548d509e17213a2f5d72b0d900b43f5430"
48-
"10.0.1":
49-
url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-10.0.1/apache-arrow-10.0.1.tar.gz?action=download"
50-
sha256: "c814e0670112a22c1a6ec03ab420a52ae236a9a42e9e438c3cbd37f37e658fb3"
51-
"10.0.0":
52-
url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-10.0.0/apache-arrow-10.0.0.tar.gz?action=download"
53-
sha256: "5b46fa4c54f53e5df0019fe0f9d421e93fc906b625ebe8e89eed010d561f1f12"
54-
"8.0.1":
55-
url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-8.0.1/apache-arrow-8.0.1.tar.gz?action=download"
56-
sha256: "82d46929f7574715551da21700f100b39f99c3c4d6790f26cac86d869d64e94e"
57-
"8.0.0":
58-
url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-8.0.0/apache-arrow-8.0.0.tar.gz?action=download"
59-
sha256: "ad9a05705117c989c116bae9ac70492fe015050e1b80fb0e38fde4b5d863aaa3"
60-
"7.0.0":
61-
url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-7.0.0/apache-arrow-7.0.0.tar.gz?action=download"
62-
sha256: "e8f49b149a15ecef4e40fcfab1b87c113c6b1ee186005c169e5cdf95d31a99de"
6342
patches:
64-
"8.0.1":
65-
- patch_file: "patches/8.0.0-0005-install-utils.patch"
66-
patch_description: "enable utils installation"
43+
"18.1.0":
44+
- patch_file: "patches/18.0.0-0001-fix-cmake.patch"
45+
patch_description: "use cci package"
6746
patch_type: "conan"
68-
- patch_file: "patches/8.0.0-0006-fix-cmake.patch"
47+
"18.0.0":
48+
- patch_file: "patches/18.0.0-0001-fix-cmake.patch"
6949
patch_description: "use cci package"
7050
patch_type: "conan"
71-
"8.0.0":
72-
- patch_file: "patches/8.0.0-0005-install-utils.patch"
73-
patch_description: "enable utils installation"
51+
"17.0.0":
52+
- patch_file: "patches/16.0.0-0001-fix-cmake.patch"
53+
patch_description: "use cci package"
7454
patch_type: "conan"
75-
- patch_file: "patches/8.0.0-0006-fix-cmake.patch"
55+
"16.1.0":
56+
- patch_file: "patches/16.0.0-0001-fix-cmake.patch"
7657
patch_description: "use cci package"
7758
patch_type: "conan"
78-
"7.0.0":
79-
- patch_file: "patches/7.0.0-0006-install-utils.patch"
80-
patch_description: "enable utils installation"
59+
"15.0.0":
60+
- patch_file: "patches/11.0.0-0001-fix-cmake.patch"
61+
patch_description: "use cci package"
8162
patch_type: "conan"
82-
- patch_file: "patches/7.0.0-0007-fix-cmake.patch"
63+
"14.0.2":
64+
- patch_file: "patches/11.0.0-0001-fix-cmake.patch"
8365
patch_description: "use cci package"
8466
patch_type: "conan"
67+

0 commit comments

Comments
 (0)