Skip to content

Commit 5e57fb1

Browse files
ansalondansalond
committed
Run gates on the imported revision of graal.
1 parent 85aa7f8 commit 5e57fb1

File tree

4 files changed

+101
-155
lines changed

4 files changed

+101
-155
lines changed

‎ci.jsonnet‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ local common = import 'common.jsonnet';
66
// Used to run fewer jobs
77
local debug = false,
88

9-
local overlay = '9255f3dca769551fd2224cb4e7e80704e1fdb60d',
9+
local overlay = 'c48d42b13ed07d9bc45ea8cd4d6d6f85c9ff2370',
1010

1111
local no_overlay = 'cb733e564850cd37b685fcef6f3c16b59802b22c',
1212

‎common.jsonnet‎

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
jdk8: {
77
downloads+: {
88
JAVA_HOME: labsjdk8,
9-
JDT: {name: 'ecj', version: '4.14.0', platformspecific: false},
109
},
1110
},
1211

@@ -107,4 +106,43 @@
107106
msvc : '==10.0',
108107
},
109108
},
109+
110+
local gateCmd = ['mx', '--strict-compliance', 'gate', '-B=--force-deprecation-as-warning', '--strict-mode', '--tags', '${TAGS}'],
111+
112+
eclipse : {
113+
downloads+: {
114+
ECLIPSE: {name: 'eclipse', version: '4.14.0', platformspecific: true},
115+
JDT: {name: 'ecj', version: '4.14.0', platformspecific: false},
116+
},
117+
environment+: {
118+
ECLIPSE_EXE: '$ECLIPSE/eclipse',
119+
},
120+
},
121+
122+
build : {
123+
run+: [
124+
['mx', 'build', '--force-javac'],
125+
],
126+
},
127+
128+
buildCompiler : {
129+
run+: [
130+
['mx', '--dynamicimports', '/compiler', 'build', '--force-javac'],
131+
],
132+
},
133+
134+
gateTags : self.build + {
135+
run+: [
136+
gateCmd,
137+
],
138+
timelimit: '30:00',
139+
},
140+
141+
gateStyleFullBuild : self.eclipse + {
142+
run+: [
143+
['set-export', 'TAGS', 'style,fullbuild'],
144+
gateCmd,
145+
],
146+
timelimit: '30:00',
147+
},
110148
}

‎graal-js/ci.jsonnet‎

Lines changed: 25 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -4,63 +4,21 @@ local common = import '../common.jsonnet';
44
local graalJs = {
55
setup: [
66
['cd', 'graal-js'],
7-
],
8-
},
9-
10-
local gateCmd = ['mx', '--strict-compliance', 'gate', '-B=--force-deprecation-as-warning', '--strict-mode', '--tags', '${GATE_TAGS}'],
11-
12-
local gateGraalImport = {
13-
downloads+: {
14-
ECLIPSE: {name: 'eclipse', version: '4.14.0', platformspecific: true},
15-
},
16-
environment+: {
17-
ECLIPSE_EXE: '$ECLIPSE/eclipse',
18-
},
19-
setup+: [
207
['mx', 'sversions'],
218
],
22-
run+: [
23-
gateCmd,
24-
],
25-
timelimit: '15:00',
269
},
2710

28-
local gateCoverage = {
29-
downloads+: {
30-
ECLIPSE: {name: 'eclipse', version: '4.14.0', platformspecific: true},
31-
},
32-
environment+: {
33-
ECLIPSE_EXE: '$ECLIPSE/eclipse',
34-
},
35-
setup+: [
36-
['mx', 'sversions'],
37-
],
11+
local gateCoverage = common.eclipse + {
3812
run+: [
3913
['set-export', 'GRAALJS_HOME', ['pwd']],
40-
['mx', '--jacoco-whitelist-package', 'com.oracle.js.parser', '--jacoco-whitelist-package', 'com.oracle.truffle.js', '--jacoco-exclude-annotation', '@GeneratedBy', '--jacoco-dest-file', '${GRAALJS_HOME}/jacoco.exec', '--strict-compliance', 'gate', '-B=--force-deprecation-as-warning', '--strict-mode', '--tags', '${GATE_TAGS}', '--jacocout', 'html'],
41-
['mx', '--jacoco-whitelist-package', 'com.oracle.js.parser', '--jacoco-whitelist-package', 'com.oracle.truffle.js', '--jacoco-exclude-annotation', '@GeneratedBy', '--jacoco-dest-file', '${GRAALJS_HOME}/jacoco.exec', 'sonarqube-upload', "-Dsonar.host.url=$SONAR_HOST_URL", "-Dsonar.projectKey=com.oracle.graalvm.js", "-Dsonar.projectName=GraalVM - JS", '--exclude-generated'],
14+
['mx', '--jacoco-whitelist-package', 'com.oracle.js.parser', '--jacoco-whitelist-package', 'com.oracle.truffle.js', '--jacoco-exclude-annotation', '@GeneratedBy', '--jacoco-dest-file', '${GRAALJS_HOME}/jacoco.exec', '--strict-compliance', 'gate', '-B=--force-deprecation-as-warning', '--strict-mode', '--tags', '${TAGS}', '--jacocout', 'html'],
15+
['mx', '--jacoco-whitelist-package', 'com.oracle.js.parser', '--jacoco-whitelist-package', 'com.oracle.truffle.js', '--jacoco-exclude-annotation', '@GeneratedBy', '--jacoco-dest-file', '${GRAALJS_HOME}/jacoco.exec', 'sonarqube-upload', '-Dsonar.host.url=$SONAR_HOST_URL', '-Dsonar.projectKey=com.oracle.graalvm.js', '-Dsonar.projectName=GraalVM - JS', '--exclude-generated'],
4216
['mx', '--jacoco-whitelist-package', 'com.oracle.js.parser', '--jacoco-whitelist-package', 'com.oracle.truffle.js', '--jacoco-exclude-annotation', '@GeneratedBy', '--jacoco-dest-file', '${GRAALJS_HOME}/jacoco.exec', 'coverage-upload']
4317
],
4418
timelimit: '30:00',
4519
},
4620

47-
local graalTip = {
48-
setup+: [
49-
['git', 'clone', '--depth', '1', ['mx', 'urlrewrite', 'https://github.com/graalvm/graal.git'], '../../graal'],
50-
['mx', 'sversions'],
51-
],
52-
timelimit: '30:00',
53-
},
54-
55-
local gateGraalTip = graalTip + {
56-
run+: [
57-
['mx', 'build', '--force-javac'],
58-
gateCmd,
59-
],
60-
timelimit: '30:00',
61-
},
62-
63-
local nativeImageGraalTip = graalTip + {
21+
local nativeImageSmokeTest = {
6422
local baseNativeImageCmd = ['mx', '--dynamicimports', '/substratevm', '--native-images=js'],
6523
run+: [
6624
['git', 'clone', '--depth', '1', ['mx', 'urlrewrite', 'https://github.com/graalvm/js-benchmarks.git'], '../../js-benchmarks'],
@@ -71,13 +29,6 @@ local common = import '../common.jsonnet';
7129
],
7230
},
7331

74-
local benchmarkGraalTip = graalTip + {
75-
run+: [
76-
['mx', '--dynamicimports', '/compiler', 'build', '--force-javac'],
77-
],
78-
timelimit: '30:00',
79-
},
80-
8132
local mavenDeployDryRun = {
8233
run+: [
8334
['mx', 'build'],
@@ -92,48 +43,48 @@ local common = import '../common.jsonnet';
9243
timelimit: '10:00',
9344
},
9445

95-
local interopJmhBenchmarks = {
46+
local interopJmhBenchmarks = common.buildCompiler + {
9647
run+: [
97-
["mx", "--dynamicimports", "/compiler", "--kill-with-sigquit", "benchmark", "--results-file", "bench-results.json", "js-interop-jmh:JS_INTEROP_MICRO_BENCHMARKS", "--", "-Dgraal.TraceTruffleCompilation=true"],
48+
['mx', '--dynamicimports', '/compiler', '--kill-with-sigquit', 'benchmark', '--results-file', 'bench-results.json', 'js-interop-jmh:JS_INTEROP_MICRO_BENCHMARKS', '--', '-Dgraal.TraceTruffleCompilation=true'],
9849
['bench-uploader.py', 'bench-results.json'],
9950
],
10051
timelimit: '30:00',
10152
},
10253

10354
builds: [
10455
// jdk 8 - linux
105-
graalJs + common.jdk8 + common.gate + common.linux + gateGraalImport + {environment+: {GATE_TAGS: 'style,fullbuild'}} + {name: 'js-gate-style-fullbuild-graal-import-jdk8-linux-amd64'},
106-
graalJs + common.jdk8 + common.gate + common.linux + gateGraalTip + {environment+: {GATE_TAGS: 'default'}} + {name: 'js-gate-default-graal-tip-jdk8-linux-amd64'},
107-
graalJs + common.jdk8 + common.gate + common.linux + gateGraalTip + {environment+: {GATE_TAGS: 'noic'}} + {name: 'js-gate-noic-graal-tip-jdk8-linux-amd64'},
108-
graalJs + common.jdk8 + common.gate + common.linux + gateGraalTip + {environment+: {GATE_TAGS: 'directbytebuffer'}} + {name: 'js-gate-directbytebuffer-graal-tip-jdk8-linux-amd64'},
109-
graalJs + common.jdk8 + common.gate + common.linux + gateGraalTip + {environment+: {GATE_TAGS: 'cloneuninitialized'}} + {name: 'js-gate-cloneuninitialized-graal-tip-jdk8-linux-amd64'},
110-
graalJs + common.jdk8 + common.gate + common.linux + gateGraalTip + {environment+: {GATE_TAGS: 'lazytranslation'}} + {name: 'js-gate-lazytranslation-graal-tip-jdk8-linux-amd64'},
111-
graalJs + common.jdk8 + common.gate + common.linux + gateGraalTip + {environment+: {GATE_TAGS: 'shareengine'}} + {name: 'js-gate-shareengine-graal-tip-jdk8-linux-amd64'},
112-
graalJs + common.jdk8 + common.gate + common.linux + gateGraalTip + {environment+: {GATE_TAGS: 'latestesversion'}} + {name: 'js-gate-latestesversion-graal-tip-jdk8-linux-amd64'},
113-
graalJs + common.jdk8 + common.gate + common.linux + gateGraalImport + {environment+: {GATE_TAGS: 'tck,build'}} + {name: 'js-gate-tck-build-graal-import-jdk8-linux-amd64'},
114-
graalJs + common.jdk8 + common.gate + common.linux + nativeImageGraalTip + {name: 'js-gate-native-image-graal-tip-jdk8-linux-amd64'},
56+
graalJs + common.jdk8 + common.gate + common.linux + common.gateStyleFullBuild + {name: 'js-gate-style-fullbuild-jdk8-linux-amd64'},
57+
graalJs + common.jdk8 + common.gate + common.linux + common.gateTags + {environment+: {TAGS: 'default'}} + {name: 'js-gate-default-jdk8-linux-amd64'},
58+
graalJs + common.jdk8 + common.gate + common.linux + common.gateTags + {environment+: {TAGS: 'noic'}} + {name: 'js-gate-noic-jdk8-linux-amd64'},
59+
graalJs + common.jdk8 + common.gate + common.linux + common.gateTags + {environment+: {TAGS: 'directbytebuffer'}} + {name: 'js-gate-directbytebuffer-jdk8-linux-amd64'},
60+
graalJs + common.jdk8 + common.gate + common.linux + common.gateTags + {environment+: {TAGS: 'cloneuninitialized'}} + {name: 'js-gate-cloneuninitialized-jdk8-linux-amd64'},
61+
graalJs + common.jdk8 + common.gate + common.linux + common.gateTags + {environment+: {TAGS: 'lazytranslation'}} + {name: 'js-gate-lazytranslation-jdk8-linux-amd64'},
62+
graalJs + common.jdk8 + common.gate + common.linux + common.gateTags + {environment+: {TAGS: 'shareengine'}} + {name: 'js-gate-shareengine-jdk8-linux-amd64'},
63+
graalJs + common.jdk8 + common.gate + common.linux + common.gateTags + {environment+: {TAGS: 'latestversion'}} + {name: 'js-gate-latestversion-jdk8-linux-amd64'},
64+
graalJs + common.jdk8 + common.gate + common.linux + common.gateTags + {environment+: {TAGS: 'tck'}} + {name: 'js-gate-tck-jdk8-linux-amd64'},
65+
graalJs + common.jdk8 + common.gate + common.linux + nativeImageSmokeTest + {name: 'js-gate-native-image-smoke-test-jdk8-linux-amd64'},
11566

11667
// jdk 8 - coverage
117-
graalJs + common.jdk8 + common.weekly + common.linux + gateCoverage + {environment+: {GATE_TAGS: 'build,default,tck'}} + {name: 'js-coverage-jdk8-linux-amd64'},
68+
graalJs + common.jdk8 + common.weekly + common.linux + gateCoverage + {environment+: {TAGS: 'build,default,tck'}} + {name: 'js-coverage-jdk8-linux-amd64'},
11869

11970
// jdk 8 - windows
120-
graalJs + common.jdk8 + common.gate + common.windows_vs2010 + gateGraalTip + {environment+: {GATE_TAGS: 'Test262-default'}} + {name: 'js-gate-test262-default-graal-tip-jdk8-windows-amd64'},
71+
graalJs + common.jdk8 + common.gate + common.windows_vs2010 + common.gateTags + {environment+: {TAGS: 'Test262-default'}} + {name: 'js-gate-test262-default-jdk8-windows-amd64'},
12172

12273
// jdk 8 - sparc
123-
graalJs + common.jdk8 + common.gate + common.sparc + gateGraalTip + {environment+: {GATE_TAGS: 'default'}} + {name: 'js-gate-default-graal-tip-jdk8-solaris-sparcv9'},
74+
graalJs + common.jdk8 + common.gate + common.sparc + common.gateTags + {environment+: {TAGS: 'default'}} + {name: 'js-gate-default-jdk8-solaris-sparcv9'},
12475

12576
// jdk 11 - linux
126-
graalJs + common.jdk11 + common.gate + common.linux + gateGraalImport + {environment+: {GATE_TAGS: 'style,fullbuild'}} + {name: 'js-gate-style-fullbuild-graal-import-jdk11-linux-amd64'},
127-
graalJs + common.jdk11 + common.gate + common.linux + gateGraalTip + {environment+: {GATE_TAGS: 'default'}} + {name: 'js-gate-default-graal-tip-jdk11-linux-amd64'},
128-
graalJs + common.jdk11 + common.gate + common.linux + mavenDeployDryRun + {name: 'js-gate-maven-dry-run-jdk11-linux-amd64'},
77+
graalJs + common.jdk11 + common.gate + common.linux + common.gateStyleFullBuild + {name: 'js-gate-style-fullbuild-jdk11-linux-amd64'},
78+
graalJs + common.jdk11 + common.gate + common.linux + common.gateTags + {environment+: {TAGS: 'default'}} + {name: 'js-gate-default-jdk11-linux-amd64'},
79+
graalJs + common.jdk11 + common.gate + common.linux + mavenDeployDryRun + {name: 'js-gate-maven-dry-run-jdk11-linux-amd64'},
12980

13081
// jdk 11 - linux aarch64
131-
graalJs + common.jdk11 + common.gate + common.linux_aarch64 + gateGraalTip + {environment+: {GATE_TAGS: 'default'}} + {name: 'js-gate-default-graal-tip-jdk11-linux-aarch64'},
82+
graalJs + common.jdk11 + common.gate + common.linux_aarch64 + common.gateTags + {environment+: {TAGS: 'default'}} + {name: 'js-gate-default-jdk11-linux-aarch64'},
13283

13384
// jdk 11 - windows
134-
graalJs + common.jdk11 + common.gate + common.windows + gateGraalTip + {environment+: {GATE_TAGS: 'Test262-default'}} + {name: 'js-gate-test262-default-graal-tip-jdk11-windows-amd64'},
85+
graalJs + common.jdk11 + common.gate + common.windows + common.gateTags + {environment+: {TAGS: 'Test262-default'}} + {name: 'js-gate-test262-default-jdk11-windows-amd64'},
13586

13687
// interop benchmarks
137-
graalJs + common.jdk8 + common.bench + common.x52 + benchmarkGraalTip + interopJmhBenchmarks + {name: 'js-interop-jmh-bechmarks-jdk8-x52'},
88+
graalJs + common.jdk8 + common.bench + common.x52 + interopJmhBenchmarks + {name: 'js-bench-interop-jmh-jdk8-linux-amd64'},
13889
],
13990
}

0 commit comments

Comments
 (0)