Skip to content

Commit 3b10cb3

Browse files
OracleLabsAutomationOracleLabsAutomation
committed
Automatic merge of master into galahad
2 parents e0f9661 + da08d8f commit 3b10cb3

File tree

7 files changed

+38
-38
lines changed

7 files changed

+38
-38
lines changed

‎ci/ci_common/musl-common.libsonnet‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
musl_dependency:: {
44
downloads+: {
55
MUSL_TOOLCHAIN: {
6-
name: 'toolchain-gcc-10.2.1-musl',
7-
version: '1.2.2',
6+
name: 'toolchain-gcc-10.3.0-zlib-1.2.13-musl',
7+
version: '1.2.5.1',
88
platformspecific: true,
99
},
1010
},

‎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),

‎sdk/mx.sdk/suite.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -228,12 +228,12 @@
228228
"os_arch": {
229229
"linux": {
230230
"amd64": {
231-
"urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/toolchain-gcc-musl/toolchain-gcc-10.2.1-musl-1.2.2-linux-amd64.tar.gz"],
232-
"digest" : "sha512:8f49b04d4826c560c791e5223f504046fa0daa6b79e581ea1781a2d01f4efe2de4a0fb6771dc1b07318ab0109a61ea3b04255eadf36191a76687f873931eb283",
231+
"urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/toolchain-gcc-musl/toolchain-gcc-10.3.0-zlib-1.2.13-musl-1.2.5.1-linux-amd64.tar.gz"],
232+
"digest" : "sha512:a4be5d7f0a0857e30992079b39b0b7a00b80b4f255a0dddf8e4208d53c0a2a79ad26dbcb3e7b4018bfc1ef5751cf2bf7180c64d6b13dd4c80ed2dd0335945736",
233233
},
234234
"aarch64": {
235-
"urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/toolchain-gcc-musl/toolchain-gcc-10.2.1-musl-1.2.2-linux-aarch64.tar.gz"],
236-
"digest" : "sha512:f5545f6b36c2306861c026895d437a57357515e8dfefb0e8419413f61b146f42dc072f8a8a7a9f4885d6448396d656f59264e61e3f5eedd278486228aa58904e",
235+
"urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/toolchain-gcc-musl/toolchain-gcc-10.3.0-zlib-1.2.13-musl-1.2.5.1-linux-aarch64.tar.gz"],
236+
"digest" : "sha512:7f645bceaad864e6a0cf3289ca234e76819f7bfc06abf0c82b59e51e152191235b65c3b7f4e9baa2f2c2982459ffec2c284d99cc28bf7923eb9022eef03ad72d",
237237
},
238238
"<others>": {
239239
"optional": True,
@@ -1626,9 +1626,9 @@ class UniversalDetector {
16261626
"source_type": "string",
16271627
"value": '''
16281628
include <ninja-toolchain:GCC_NINJA_TOOLCHAIN>
1629-
CC=<path:MUSL_GCC_TOOLCHAIN>/x86_64-linux-musl-native/bin/gcc
1630-
CXX=<path:MUSL_GCC_TOOLCHAIN>/x86_64-linux-musl-native/bin/g++
1631-
AR=<path:MUSL_GCC_TOOLCHAIN>/x86_64-linux-musl-native/bin/ar
1629+
CC=<path:MUSL_GCC_TOOLCHAIN>/musl-toolchain/bin/x86_64-linux-musl-gcc
1630+
CXX=<path:MUSL_GCC_TOOLCHAIN>/musl-toolchain/bin/x86_64-linux-musl-g++
1631+
AR=<path:MUSL_GCC_TOOLCHAIN>/musl-toolchain/bin/x86_64-linux-musl-ar
16321632
CFLAGS=
16331633
CXXFLAGS=
16341634
LDFLAGS=
@@ -1646,9 +1646,9 @@ class UniversalDetector {
16461646
"source_type": "string",
16471647
"value": '''
16481648
include <ninja-toolchain:GCC_NINJA_TOOLCHAIN>
1649-
CC=<path:MUSL_GCC_TOOLCHAIN>/aarch64-linux-musl-native/bin/gcc
1650-
CXX=<path:MUSL_GCC_TOOLCHAIN>/aarch64-linux-musl-native/bin/g++
1651-
AR=<path:MUSL_GCC_TOOLCHAIN>/aarch64-linux-musl-native/bin/ar
1649+
CC=<path:MUSL_GCC_TOOLCHAIN>/musl-toolchain/bin/aarch64-linux-musl-gcc
1650+
CXX=<path:MUSL_GCC_TOOLCHAIN>/musl-toolchain/bin/aarch64-linux-musl-g++
1651+
AR=<path:MUSL_GCC_TOOLCHAIN>/musl-toolchain/bin/aarch64-linux-musl-ar
16521652
CFLAGS=
16531653
CXXFLAGS=
16541654
LDFLAGS=
@@ -1688,9 +1688,9 @@ class UniversalDetector {
16881688
"toolchain.cmake" : {
16891689
"source_type": "string",
16901690
"value": '''
1691-
set(CMAKE_C_COMPILER <path:MUSL_GCC_TOOLCHAIN>/x86_64-linux-musl-native/bin/gcc)
1692-
set(CMAKE_CXX_COMPILER <path:MUSL_GCC_TOOLCHAIN>/x86_64-linux-musl-native/bin/g++)
1693-
set(CMAKE_AR <path:MUSL_GCC_TOOLCHAIN>/x86_64-linux-musl-native/bin/ar)
1691+
set(CMAKE_C_COMPILER <path:MUSL_GCC_TOOLCHAIN>/musl-toolchain/bin/x86_64-linux-musl-gcc)
1692+
set(CMAKE_CXX_COMPILER <path:MUSL_GCC_TOOLCHAIN>/musl-toolchain/bin/x86_64-linux-musl-g++)
1693+
set(CMAKE_AR <path:MUSL_GCC_TOOLCHAIN>/musl-toolchain/bin/x86_64-linux-musl-ar)
16941694
'''
16951695
},
16961696
},
@@ -1703,9 +1703,9 @@ class UniversalDetector {
17031703
"toolchain.cmake" : {
17041704
"source_type": "string",
17051705
"value": '''
1706-
set(CMAKE_C_COMPILER <path:MUSL_GCC_TOOLCHAIN>/aarch64-linux-musl-native/bin/gcc)
1707-
set(CMAKE_CXX_COMPILER <path:MUSL_GCC_TOOLCHAIN>/aarch64-linux-musl-native/bin/g++)
1708-
set(CMAKE_AR <path:MUSL_GCC_TOOLCHAIN>/aarch64-linux-musl-native/bin/ar)
1706+
set(CMAKE_C_COMPILER <path:MUSL_GCC_TOOLCHAIN>/musl-toolchain/bin/aarch64-linux-musl-gcc)
1707+
set(CMAKE_CXX_COMPILER <path:MUSL_GCC_TOOLCHAIN>/musl-toolchain/bin/aarch64-linux-musl-g++)
1708+
set(CMAKE_AR <path:MUSL_GCC_TOOLCHAIN>/musl-toolchain/bin/aarch64-linux-musl-ar)
17091709
'''
17101710
},
17111711
},

‎substratevm/ci/ci_common/svm-gate.libsonnet‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
mxgate_config+::["musl-dynamic"],
100100
mxgate_extra_args+: ["--extra-image-builder-arguments=--libc=musl -H:+UnlockExperimentalVMOptions -H:-StaticExecutable -H:-UnlockExperimentalVMOptions"],
101101
environment+: {
102-
MX_SVMTEST_RUN_PREFIX: "$MUSL_TOOLCHAIN/lib/libc.so ", # see GR-53484, launching the ELF file with the right interpreter
102+
MX_SVMTEST_RUN_PREFIX: "$MUSL_TOOLCHAIN/x86_64-linux-musl/lib/libc.so ", # see GR-53484, launching the ELF file with the right interpreter. If the path is incorrect, some svm tests fail with "FAILED image construction: java.lang.AssertionError: internal error"
103103
},
104104
} +
105105
# The galahad gates run with oracle JDK, which do not offer a musl build

‎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: 2 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,7 @@ 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+
# We do not have a gate that executes a dry-run of Maven deployment for darwin/amd64. We just rely on the daily job defined below.
139136
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') + {
140137
name: 'daily-deploy-vm-maven-darwin-amd64',
141138
timelimit: '1:00:00',

0 commit comments

Comments
 (0)