Skip to content

Commit d8d8095

Browse files
committed
fix(cfg): 24.04 LTS -> 24.04
1 parent 0ecaffb commit d8d8095

File tree

2 files changed

+22
-13
lines changed

2 files changed

+22
-13
lines changed

ci/create_ci_vars_using_the_gh_api.ers

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
//
1515

1616
/// If true, create vars (`--method POST`). If false, update vars (`--method PATCH`).
17-
const CREATE_VARS: bool = true;
17+
const CREATE_VARS: bool = false;
18+
19+
const RUN_GH: bool = true;
1820

1921
use anyhow::{bail, Context};
2022
use ron::ser::PrettyConfig;
@@ -96,7 +98,12 @@ fn main() -> anyhow::Result<()> {
9698

9799
let value = CI::builder()
98100
.archs(arch_vec.join(" "))
99-
.ver(os.version)
101+
.ver(
102+
os.version
103+
.split_ascii_whitespace()
104+
.next()
105+
.expect("Invalid version"),
106+
)
100107
.matrix(MatrixArch { arch: matrix_arch })
101108
.build();
102109

@@ -105,7 +112,9 @@ fn main() -> anyhow::Result<()> {
105112
.value(serde_json::to_string(&value)?)
106113
.build();
107114

108-
run_gh(&post_data, gh_repo)?;
115+
if RUN_GH {
116+
run_gh(&post_data, gh_repo)?;
117+
}
109118

110119
map.insert(series.to_owned(), value);
111120
}

ci/os.ron

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
matrix: (arch: ["s390x", "ppc64el", "i386", "armhf", "arm64", "amd64"]),
66
),
77
"bionic": (
8-
ver: "18.04 LTS",
8+
ver: "18.04",
99
archs: "s390x ppc64el i386 armhf arm64 amd64",
1010
matrix: (arch: ["s390x", "ppc64el", "i386", "armhf", "arm64", "amd64"]),
1111
),
@@ -20,7 +20,7 @@
2020
matrix: (arch: ["s390x", "ppc64el", "i386", "armhf", "arm64", "amd64"]),
2121
),
2222
"dapper": (
23-
ver: "6.06 LTS",
23+
ver: "6.06",
2424
archs: "amd64 i386 powerpc sparc hppa",
2525
matrix: (arch: ["amd64", "i386", "powerpc", "sparc", "hppa"]),
2626
),
@@ -50,7 +50,7 @@
5050
matrix: (arch: ["sparc", "powerpc", "i386", "hppa", "amd64", "lpia"]),
5151
),
5252
"focal": (
53-
ver: "20.04 LTS",
53+
ver: "20.04",
5454
archs: "s390x riscv64 ppc64el i386 armhf arm64 amd64",
5555
matrix: (arch: ["s390x", "riscv64", "ppc64el", "i386", "armhf", "arm64", "amd64"]),
5656
),
@@ -65,7 +65,7 @@
6565
matrix: (arch: ["powerpc", "lpia", "i386", "hppa", "amd64", "lpia"]),
6666
),
6767
"hardy": (
68-
ver: "8.04 LTS",
68+
ver: "8.04",
6969
archs: "armhf armel sparc powerpc i386 hppa amd64 lpia",
7070
matrix: (arch: ["armhf", "armel", "sparc", "powerpc", "i386", "hppa", "amd64", "lpia"]),
7171
),
@@ -90,7 +90,7 @@
9090
matrix: (arch: ["armel", "hppa", "sparc", "powerpc", "i386", "amd64", "lpia"]),
9191
),
9292
"jammy": (
93-
ver: "22.04 LTS",
93+
ver: "22.04",
9494
archs: "s390x riscv64 ppc64el i386 armhf arm64 amd64",
9595
matrix: (arch: ["s390x", "riscv64", "ppc64el", "i386", "armhf", "arm64", "amd64"]),
9696
),
@@ -110,7 +110,7 @@
110110
matrix: (arch: ["s390x", "riscv64", "ppc64el", "i386", "armhf", "arm64", "amd64"]),
111111
),
112112
"lucid": (
113-
ver: "10.04 LTS",
113+
ver: "10.04",
114114
archs: "armhf sparc powerpc i386 armel amd64",
115115
matrix: (arch: ["armhf", "sparc", "powerpc", "i386", "armel", "amd64"]),
116116
),
@@ -135,7 +135,7 @@
135135
matrix: (arch: ["armhf", "powerpc", "i386", "armel", "amd64"]),
136136
),
137137
"noble": (
138-
ver: "24.04 LTS",
138+
ver: "24.04",
139139
archs: "s390x riscv64 ppc64el i386 armhf arm64 amd64",
140140
matrix: (arch: ["s390x", "riscv64", "ppc64el", "i386", "armhf", "arm64", "amd64"]),
141141
),
@@ -145,7 +145,7 @@
145145
matrix: (arch: ["armhf", "powerpc", "i386", "armel", "amd64"]),
146146
),
147147
"precise": (
148-
ver: "12.04 LTS",
148+
ver: "12.04",
149149
archs: "powerpc i386 armhf armel amd64",
150150
matrix: (arch: ["powerpc", "i386", "armhf", "armel", "amd64"]),
151151
),
@@ -165,7 +165,7 @@
165165
matrix: (arch: ["powerpc", "i386", "armhf", "amd64", "arm64"]),
166166
),
167167
"trusty": (
168-
ver: "14.04 LTS",
168+
ver: "14.04",
169169
archs: "ppc64el powerpc i386 armhf arm64 amd64",
170170
matrix: (arch: ["ppc64el", "powerpc", "i386", "armhf", "arm64", "amd64"]),
171171
),
@@ -190,7 +190,7 @@
190190
matrix: (arch: ["i386", "ppc64el", "armhf", "amd64", "arm64", "powerpc"]),
191191
),
192192
"xenial": (
193-
ver: "16.04 LTS",
193+
ver: "16.04",
194194
archs: "s390x ppc64el powerpc i386 armhf arm64 amd64",
195195
matrix: (arch: ["s390x", "ppc64el", "powerpc", "i386", "armhf", "arm64", "amd64"]),
196196
),

0 commit comments

Comments
 (0)