Skip to content

Commit 55887f9

Browse files
committed
Move remaining gates not associated to a tier to post-merge.
1 parent 47594e2 commit 55887f9

File tree

3 files changed

+19
-15
lines changed

3 files changed

+19
-15
lines changed

tools/ci/ci.jsonnet

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@
2222
}
2323
},
2424

25-
local tools_gate = gate_guard + tools_common + common.deps.eclipse + common.deps.jdt + common.deps.spotbugs + {
26-
name: 'gate-tools-oracle' + self.jdk_name + '-' + self.os + '-' + self.arch,
25+
local tools_post_merge = gate_guard + tools_common + common.deps.eclipse + common.deps.jdt + common.deps.spotbugs + {
26+
name: 'post-merge-tools-oracle' + self.jdk_name + '-' + self.os + '-' + self.arch,
2727
run: [["mx", "--strict-compliance", "gate", "--strict-mode"]],
28-
targets: ["gate"],
28+
targets: ["post-merge"],
2929
guard+: {
3030
includes+: ["**.jsonnet"],
31-
}
31+
},
32+
notify_groups:: ["tools"],
3233
},
3334

3435
local tools_weekly = tools_common + {
@@ -43,12 +44,13 @@
4344
},
4445

4546
local tools_javadoc = tools_common + common_guard + {
46-
name: "gate-tools-javadoc-" + self.jdk_name,
47+
name: "post-merge-tools-javadoc-" + self.jdk_name,
4748
run: [
4849
["mx", "build"],
4950
["mx", "javadoc"],
5051
],
51-
targets: ["gate"]
52+
targets: ["post-merge"],
53+
notify_groups:: ["tools"],
5254
},
5355

5456
local coverage_whitelisting = [
@@ -82,8 +84,8 @@
8284
},
8385

8486
local _builds = [
85-
common.linux_amd64 + common.oraclejdkLatest + tools_gate,
86-
common.linux_amd64 + common.oraclejdk21 + tools_gate,
87+
common.linux_amd64 + common.oraclejdkLatest + tools_post_merge,
88+
common.linux_amd64 + common.oraclejdk21 + tools_post_merge,
8789

8890
common.linux_amd64 + common.oraclejdkLatest + tools_javadoc,
8991
common.linux_amd64 + common.oraclejdk21 + tools_coverage_weekly,

vm/ci/ci_includes/vm-native.jsonnet

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,17 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet';
4141
},
4242

4343
local builds = [
44-
vm.vm_java_Latest + graal_common.deps.svm + graal_common.deps.sulong + graal_common.deps.graalpy + vm.custom_vm + vm_common.vm_base('linux', 'amd64', 'gate') + {
44+
vm.vm_java_Latest + graal_common.deps.svm + graal_common.deps.sulong + graal_common.deps.graalpy + vm.custom_vm + vm_common.vm_base('linux', 'amd64', 'post-merge') + {
4545
run+: [
4646
['mx', '--env', vm.edition, '--native-images=true', '--dy', 'graalpython', 'gate', '-B--targets=GRAALPY_NATIVE_STANDALONE', '--no-warning-as-error', '--tags', 'build,python'],
4747
],
48+
notify_groups: ["python"],
4849
timelimit: '45:00',
49-
name: 'gate-vm-native-graalpython-linux-amd64',
50+
name: 'post-merge-vm-native-graalpython-linux-amd64',
5051
},
51-
vm.vm_java_Latest + vm_common.vm_base('linux', 'amd64', 'gate') + truffle_native_tck,
52-
vm.vm_java_Latest + vm_common.vm_base('linux', 'amd64', 'gate') + truffle_native_tck_wasm,
53-
vm.vm_java_Latest + vm_common.vm_base('linux', 'amd64', 'gate') + truffle_maven_downloader,
52+
vm.vm_java_Latest + vm_common.vm_base('linux', 'amd64', 'post-merge') + truffle_native_tck,
53+
vm.vm_java_Latest + vm_common.vm_base('linux', 'amd64', 'post-merge') + truffle_native_tck_wasm,
54+
vm.vm_java_Latest + vm_common.vm_base('linux', 'amd64', 'post-merge') + truffle_maven_downloader,
5455
],
5556

5657
builds: utils.add_defined_in(builds, std.thisFile),

vm/ci/ci_includes/vm.jsonnet

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet';
8686
},
8787

8888
local builds = [
89-
self.vm_java_Latest + vm_common.vm_base('linux', 'amd64', 'gate') + graal_common.deps.sulong + {
89+
self.vm_java_Latest + vm_common.vm_base('linux', 'amd64', 'post-merge') + graal_common.deps.sulong + {
9090
environment+: {
9191
DYNAMIC_IMPORTS: '/tools,/substratevm,/sulong',
9292
NATIVE_IMAGES: 'polyglot',
@@ -95,8 +95,9 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet';
9595
['rm', '-rf', '../.git'],
9696
['mx', 'gate', '--strict-mode', '--tags', 'build'],
9797
],
98-
name: 'gate-vm-build-without-vcs-linux-amd64',
98+
name: 'post-merge-vm-build-without-vcs-linux-amd64',
9999
timelimit: '30:00',
100+
notify_groups:: ['deploy'],
100101
},
101102

102103
# Linux/AMD64

0 commit comments

Comments
 (0)