Skip to content

Commit 42658be

Browse files
ansalondansalond
committed
Move darwin/amd64 gate jobs to daily.
1 parent 4e5a87c commit 42658be

File tree

4 files changed

+22
-19
lines changed

4 files changed

+22
-19
lines changed

‎sdk/ci/ci.jsonnet‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,29 @@
22
local common = import '../../ci/ci_common/common.jsonnet',
33
local utils = import '../../ci/ci_common/common-utils.libsonnet',
44

5-
local sdk_gate = common.deps.spotbugs {
6-
name: 'gate-sdk-oracle' + self.jdk_name + '-' + self.os + '-' + self.arch,
5+
local sdk_gate(target) = common.deps.spotbugs {
6+
name: target + '-sdk-oracle' + self.jdk_name + '-' + self.os + '-' + self.arch,
77
setup: [
88
["cd", "./sdk"],
99
],
1010
run: [
1111
["mx", "gate"]
1212
],
13-
targets: ["gate"],
13+
targets: [target],
1414
timelimit: "30:00",
1515
guard+: {
1616
includes+: ["<graal>/sdk/**", "**.jsonnet"] + utils.top_level_ci,
17-
}
17+
},
18+
notify_groups: ["truffle"],
1819
},
1920

2021
local _builds = [
21-
common.linux_amd64 + common.oraclejdkLatest + sdk_gate + common.deps.eclipse + common.deps.jdt,
22-
common.linux_amd64 + common.oraclejdk21 + sdk_gate + common.deps.eclipse + common.deps.jdt,
23-
common.darwin_amd64 + common.oraclejdkLatest + sdk_gate,
24-
common.darwin_aarch64 + common.oraclejdkLatest + sdk_gate,
25-
common.darwin_amd64 + common.oraclejdk21 + sdk_gate,
22+
common.linux_amd64 + common.oraclejdkLatest + sdk_gate("gate") + common.deps.eclipse + common.deps.jdt,
23+
common.linux_amd64 + common.oraclejdk21 + sdk_gate("gate") + common.deps.eclipse + common.deps.jdt,
24+
common.darwin_aarch64 + common.oraclejdkLatest + sdk_gate("gate"),
25+
common.darwin_aarch64 + common.oraclejdk21 + sdk_gate("gate"),
26+
common.darwin_amd64 + common.oraclejdkLatest + sdk_gate("daily"),
27+
common.darwin_amd64 + common.oraclejdk21 + sdk_gate("daily"),
2628
],
2729

2830
builds: utils.add_defined_in(_builds, std.thisFile),

‎sulong/ci/ci.jsonnet‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ local sc = (import "ci_common/sulong-common.jsonnet");
7171
$.sulong + $.gate() + sc.labsjdkLatest + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.gateTags("build,gcc_c") + { name: "gate-sulong-gcc_c-jdk-latest-linux-amd64", timelimit: "45:00" },
7272
$.sulong + $.gate() + sc.labsjdkLatest + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.gateTags("build,gcc_cpp") + { name: "gate-sulong-gcc_cpp-jdk-latest-linux-amd64", timelimit: "45:00" },
7373

74-
$.sulong + $.gate() + sc.labsjdkLatest + sc.darwin_amd64 + sc.llvmBundled + sc.gateTags(basicTags) + { name: "gate-sulong-basic-nwcc-llvm-jdk-latest-darwin-amd64", timelimit: "0:45:00", capabilities+: ["ram16gb"] },
74+
$.sulong + $.gate() + sc.labsjdkLatest + sc.darwin_amd64 + sc.llvmBundled + sc.gateTags(basicTags) + { name: "daily-sulong-basic-nwcc-llvm-jdk-latest-darwin-amd64", timelimit: "0:45:00", capabilities+: ["ram16gb"], targets: []} + sc.daily,
7575

7676
$.sulong + $.gate() + sc.labsjdkLatest + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.gateTags(basicTags) + { name: "gate-sulong-basic-nwcc-llvm-jdk-latest-linux-amd64" },
7777

‎truffle/ci/ci.jsonnet‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,13 @@
3535
]
3636
},
3737

38-
local gate_lite = truffle_common + {
39-
name: 'gate-truffle-lite-oraclejdk-' + self.jdk_name + '-' + self.os + '-' + self.arch,
38+
local gate_lite(target) = truffle_common + {
39+
name: target + '-truffle-lite-oraclejdk-' + self.jdk_name + '-' + self.os + '-' + self.arch,
4040
run: [
4141
["mx", "build"],
4242
["mx", "unittest", "--verbose"],
4343
],
44+
targets: [target],
4445
},
4546

4647
local sigtest = truffle_common + {
@@ -150,8 +151,8 @@
150151
local _builds = std.flattenArrays([
151152
[
152153
linux_amd64 + jdk + sigtest + guard,
153-
darwin_amd64 + jdk + truffle_weekly + gate_lite + guard,
154-
darwin_aarch64 + jdk + truffle_weekly + gate_lite + guard,
154+
darwin_amd64 + jdk + truffle_weekly + gate_lite("daily") + guard,
155+
darwin_aarch64 + jdk + truffle_weekly + gate_lite("gate") + guard,
155156
] for jdk in [common.oraclejdk21, common.oraclejdkLatest]
156157
]) +
157158
[

‎vm/ci/ci_includes/vm.jsonnet‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet';
112112
},
113113

114114
# Linux/AMD64
115-
vm_common.graalvm_complete_build_deps('ce', 'linux', 'amd64', java_version='latest') + vm_common.linux_deploy + vm_common.vm_base('linux', 'amd64', 'gate') + vm_common.maven_deploy_base_functions.base_object('linux', 'amd64', dry_run=true, remote_mvn_repo=$.maven_deploy_repository, remote_non_mvn_repo=$.binaries_repository, local_repo='local') + {
115+
vm_common.graalvm_complete_build_deps('ce', 'linux', 'amd64', java_version='latest') + vm_common.linux_deploy + vm_common.vm_base('linux', 'amd64', 'gate') + vm_common.maven_deploy_base_functions.base_object('linux', 'amd64', dry_run=true, remote_mvn_repo=$.maven_deploy_repository, remote_non_mvn_repo=$.binaries_repository, local_repo='local', other_platforms=['linux-aarch64', 'darwin-aarch64', 'windows-amd64']) + {
116116
name: 'gate-vm-maven-dry-run-linux-amd64',
117117
timelimit: '1:00:00',
118118
},
@@ -132,10 +132,10 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet';
132132
notify_groups:: ['deploy'],
133133
},
134134
# Darwin/AMD64
135-
vm_common.graalvm_complete_build_deps('ce', 'darwin', 'amd64', java_version='latest') + vm_common.darwin_deploy + vm_common.vm_base('darwin', 'amd64', 'gate', jdk_hint='Latest') + vm_common.maven_deploy_base_functions.base_object('darwin', 'amd64', dry_run=true, remote_mvn_repo=$.maven_deploy_repository, remote_non_mvn_repo=$.binaries_repository, local_repo='local') + {
136-
name: 'gate-vm-maven-dry-run-darwin-amd64',
137-
timelimit: '1:00:00',
138-
},
135+
# vm_common.graalvm_complete_build_deps('ce', 'darwin', 'amd64', java_version='latest') + vm_common.darwin_deploy + vm_common.vm_base('darwin', 'amd64', 'gate', jdk_hint='Latest') + vm_common.maven_deploy_base_functions.base_object('darwin', 'amd64', dry_run=true, remote_mvn_repo=$.maven_deploy_repository, remote_non_mvn_repo=$.binaries_repository, local_repo='local') + {
136+
# name: 'gate-vm-maven-dry-run-darwin-amd64',
137+
# timelimit: '1:00:00',
138+
#},
139139
vm_common.graalvm_complete_build_deps('ce', 'darwin', 'amd64', java_version='latest') + vm_common.darwin_deploy + vm_common.vm_base('darwin', 'amd64', 'daily', deploy=true, jdk_hint='Latest') + vm_common.maven_deploy_base_functions.base_object('darwin', 'amd64', dry_run=false, remote_mvn_repo=$.maven_deploy_repository, remote_non_mvn_repo=$.binaries_repository, local_repo='local') + {
140140
name: 'daily-deploy-vm-maven-darwin-amd64',
141141
timelimit: '1:00:00',

0 commit comments

Comments
 (0)