Skip to content

Commit 9f016aa

Browse files
committed
[GR-43849] Using devtoolset version 10 for linux_aarch64 jobs.
PullRequest: graal/15137
2 parents 0968769 + 45e61a9 commit 9f016aa

File tree

5 files changed

+42
-15
lines changed

5 files changed

+42
-15
lines changed

ci/common.jsonnet

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,13 @@ local common_json = import "../common.json";
121121

122122
graalnodejs:: {
123123
packages+: if self.os == "linux" then {
124-
"00:devtoolset": "==11",
125124
cmake: "==3.22.2",
126-
} else {},
125+
} + (if self.arch == "aarch64" then {
126+
"00:devtoolset": "==10",
127+
} else {
128+
"00:devtoolset": "==11",
129+
})
130+
else {},
127131
},
128132

129133
svm:: {
@@ -141,9 +145,13 @@ local common_json = import "../common.json";
141145
"*.log",
142146
],
143147

144-
packages+: if self.os == "linux" && std.objectHas(self, "os_distro") && self.os_distro == "ol" then {
145-
"00:devtoolset": "==11",
146-
} else {},
148+
packages+: if self.os == "linux" && std.objectHas(self, "os_distro") && self.os_distro == "ol" then
149+
(if self.arch == "aarch64" then {
150+
"00:devtoolset": "==10",
151+
} else {
152+
"00:devtoolset": "==11",
153+
})
154+
else {},
147155
},
148156
},
149157

espresso/ci/ci_common/common.jsonnet

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,20 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo'];
2626

2727
linux: {
2828
packages+: {
29-
'00:devtoolset': '==11', # GCC 11.2, make 4.3, binutils 2.36, valgrind 3.17
3029
ruby: "==3.0.2",
3130
},
3231
},
3332

34-
linux_amd64: self.common + self.linux + graal_common.linux_amd64,
35-
linux_aarch64: self.common + self.linux + graal_common.linux_aarch64,
33+
linux_amd64: self.common + self.linux + graal_common.linux_amd64 + {
34+
packages+: {
35+
'00:devtoolset': '==11', # GCC 11.2, make 4.3, binutils 2.36, valgrind 3.17
36+
},
37+
},
38+
linux_aarch64: self.common + self.linux + graal_common.linux_aarch64 + {
39+
packages+: {
40+
'00:devtoolset': '==10', # GCC 10.2.1, make 4.2.1, binutils 2.35, valgrind 3.16.1
41+
},
42+
},
3643

3744
x52: {
3845
capabilities+: ['no_frequency_scaling', 'tmpfs25g', 'x52'],

truffle/ci/ci.jsonnet

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,12 @@
7373
name: 'gate-external-mvn-simplelanguage-' + self.jdk_version,
7474
packages+: {
7575
maven: "==3.3.9",
76-
"00:devtoolset": "==11", # GCC 11.2, make 4.3, binutils 2.36, valgrind 3.17
7776
ruby: ">=2.1.0",
78-
},
77+
} + (if self.arch == "aarch64" then {
78+
"00:devtoolset": "==10", # GCC 10.2.1, make 4.2.1, binutils 2.35, valgrind 3.16.1
79+
} else {
80+
"00:devtoolset": "==11", # GCC 11.2, make 4.3, binutils 2.36, valgrind 3.17
81+
}),
7982
mx_cmd: ["mx", "-p", "../vm", "--dynamicimports", "/substratevm", "--native-images=none"],
8083
run+: [
8184
["set-export", "ROOT_DIR", ["pwd"]],

vm/ci/ci_common/common.jsonnet

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,11 @@ local devkits = graal_common.devkits;
2929
},
3030

3131
common_vm_linux: self.common_vm + {
32-
packages+: {
32+
packages+: (if self.arch == "aarch64" then {
33+
"00:devtoolset": "==10", # GCC 10.2.1, make 4.2.1, binutils 2.35, valgrind 3.16.1
34+
} else {
3335
"00:devtoolset": "==11", # GCC 11.2, make 4.3, binutils 2.36, valgrind 3.17
34-
},
36+
}),
3537
},
3638

3739
common_vm_darwin: self.common_vm + {

wasm/ci/ci_common/common.jsonnet

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,20 @@ local graal_suite_root = root_ci.graal_suite_root;
3232

3333
linux_common:: {
3434
packages+: {
35-
devtoolset: "==11", # GCC 11.2, make 4.3, binutils 2.36, valgrind 3.17
3635
llvm: '==8.0.1',
3736
},
3837
},
3938

40-
linux_amd64:: common.linux_amd64 + self.linux_common,
41-
linux_aarch64:: common.linux_aarch64 + self.linux_common,
39+
linux_amd64:: common.linux_amd64 + self.linux_common + {
40+
packages+: {
41+
devtoolset: "==11", # GCC 11.2, make 4.3, binutils 2.36, valgrind 3.17
42+
},
43+
},
44+
linux_aarch64:: common.linux_aarch64 + self.linux_common + {
45+
packages+: {
46+
devtoolset: "==10", # GCC 10.2.1, make 4.2.1, binutils 2.35, valgrind 3.16.1
47+
},
48+
},
4249

4350
darwin_aarch64:: common.darwin_aarch64,
4451
darwin_amd64:: common.darwin_amd64 + {

0 commit comments

Comments
 (0)