Skip to content

Commit 3330948

Browse files
authored
ci: Update Conan to 2.22.2 (#6019)
This updates the CI image hashes after following change: XRPLF/ci#81. And, since we use latest Conan, we can have `conan.lock` with a newline at the end, and we don't need to exclude it from `pre-commit` hooks any longer.
1 parent 098eadc commit 3330948

File tree

2 files changed

+25
-26
lines changed

2 files changed

+25
-26
lines changed

.github/scripts/strategy-matrix/linux.json

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,168 +15,168 @@
1515
"distro_version": "bookworm",
1616
"compiler_name": "gcc",
1717
"compiler_version": "12",
18-
"image_sha": "97ba375"
18+
"image_sha": "e1782cd"
1919
},
2020
{
2121
"distro_name": "debian",
2222
"distro_version": "bookworm",
2323
"compiler_name": "gcc",
2424
"compiler_version": "13",
25-
"image_sha": "97ba375"
25+
"image_sha": "e1782cd"
2626
},
2727
{
2828
"distro_name": "debian",
2929
"distro_version": "bookworm",
3030
"compiler_name": "gcc",
3131
"compiler_version": "14",
32-
"image_sha": "97ba375"
32+
"image_sha": "e1782cd"
3333
},
3434
{
3535
"distro_name": "debian",
3636
"distro_version": "bookworm",
3737
"compiler_name": "gcc",
3838
"compiler_version": "15",
39-
"image_sha": "97ba375"
39+
"image_sha": "e1782cd"
4040
},
4141
{
4242
"distro_name": "debian",
4343
"distro_version": "bookworm",
4444
"compiler_name": "clang",
4545
"compiler_version": "16",
46-
"image_sha": "97ba375"
46+
"image_sha": "e1782cd"
4747
},
4848
{
4949
"distro_name": "debian",
5050
"distro_version": "bookworm",
5151
"compiler_name": "clang",
5252
"compiler_version": "17",
53-
"image_sha": "97ba375"
53+
"image_sha": "e1782cd"
5454
},
5555
{
5656
"distro_name": "debian",
5757
"distro_version": "bookworm",
5858
"compiler_name": "clang",
5959
"compiler_version": "18",
60-
"image_sha": "97ba375"
60+
"image_sha": "e1782cd"
6161
},
6262
{
6363
"distro_name": "debian",
6464
"distro_version": "bookworm",
6565
"compiler_name": "clang",
6666
"compiler_version": "19",
67-
"image_sha": "97ba375"
67+
"image_sha": "e1782cd"
6868
},
6969
{
7070
"distro_name": "debian",
7171
"distro_version": "bookworm",
7272
"compiler_name": "clang",
7373
"compiler_version": "20",
74-
"image_sha": "97ba375"
74+
"image_sha": "e1782cd"
7575
},
7676
{
7777
"distro_name": "rhel",
7878
"distro_version": "8",
7979
"compiler_name": "gcc",
8080
"compiler_version": "14",
81-
"image_sha": "97ba375"
81+
"image_sha": "e1782cd"
8282
},
8383
{
8484
"distro_name": "rhel",
8585
"distro_version": "8",
8686
"compiler_name": "clang",
8787
"compiler_version": "any",
88-
"image_sha": "97ba375"
88+
"image_sha": "e1782cd"
8989
},
9090
{
9191
"distro_name": "rhel",
9292
"distro_version": "9",
9393
"compiler_name": "gcc",
9494
"compiler_version": "12",
95-
"image_sha": "97ba375"
95+
"image_sha": "e1782cd"
9696
},
9797
{
9898
"distro_name": "rhel",
9999
"distro_version": "9",
100100
"compiler_name": "gcc",
101101
"compiler_version": "13",
102-
"image_sha": "97ba375"
102+
"image_sha": "e1782cd"
103103
},
104104
{
105105
"distro_name": "rhel",
106106
"distro_version": "9",
107107
"compiler_name": "gcc",
108108
"compiler_version": "14",
109-
"image_sha": "97ba375"
109+
"image_sha": "e1782cd"
110110
},
111111
{
112112
"distro_name": "rhel",
113113
"distro_version": "9",
114114
"compiler_name": "clang",
115115
"compiler_version": "any",
116-
"image_sha": "97ba375"
116+
"image_sha": "e1782cd"
117117
},
118118
{
119119
"distro_name": "rhel",
120120
"distro_version": "10",
121121
"compiler_name": "gcc",
122122
"compiler_version": "14",
123-
"image_sha": "97ba375"
123+
"image_sha": "e1782cd"
124124
},
125125
{
126126
"distro_name": "rhel",
127127
"distro_version": "10",
128128
"compiler_name": "clang",
129129
"compiler_version": "any",
130-
"image_sha": "97ba375"
130+
"image_sha": "e1782cd"
131131
},
132132
{
133133
"distro_name": "ubuntu",
134134
"distro_version": "jammy",
135135
"compiler_name": "gcc",
136136
"compiler_version": "12",
137-
"image_sha": "97ba375"
137+
"image_sha": "e1782cd"
138138
},
139139
{
140140
"distro_name": "ubuntu",
141141
"distro_version": "noble",
142142
"compiler_name": "gcc",
143143
"compiler_version": "13",
144-
"image_sha": "97ba375"
144+
"image_sha": "e1782cd"
145145
},
146146
{
147147
"distro_name": "ubuntu",
148148
"distro_version": "noble",
149149
"compiler_name": "gcc",
150150
"compiler_version": "14",
151-
"image_sha": "97ba375"
151+
"image_sha": "e1782cd"
152152
},
153153
{
154154
"distro_name": "ubuntu",
155155
"distro_version": "noble",
156156
"compiler_name": "clang",
157157
"compiler_version": "16",
158-
"image_sha": "97ba375"
158+
"image_sha": "e1782cd"
159159
},
160160
{
161161
"distro_name": "ubuntu",
162162
"distro_version": "noble",
163163
"compiler_name": "clang",
164164
"compiler_version": "17",
165-
"image_sha": "97ba375"
165+
"image_sha": "e1782cd"
166166
},
167167
{
168168
"distro_name": "ubuntu",
169169
"distro_version": "noble",
170170
"compiler_name": "clang",
171171
"compiler_version": "18",
172-
"image_sha": "97ba375"
172+
"image_sha": "e1782cd"
173173
},
174174
{
175175
"distro_name": "ubuntu",
176176
"distro_version": "noble",
177177
"compiler_name": "clang",
178178
"compiler_version": "19",
179-
"image_sha": "97ba375"
179+
"image_sha": "e1782cd"
180180
}
181181
],
182182
"build_type": ["Debug", "Release"],

.pre-commit-config.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,5 @@ repos:
3434
exclude: |
3535
(?x)^(
3636
external/.*|
37-
.github/scripts/levelization/results/.*\.txt|
38-
conan\.lock
37+
.github/scripts/levelization/results/.*\.txt
3938
)$

0 commit comments

Comments
 (0)