Skip to content

Commit a0552f0

Browse files
committed
Merge pull request #192 in G/truffle from feature/deploy_binaries to master
* commit 'fffe60032dd9ed1ffa69b14548be2e7c6ec94705': Use targets and capabilities in the hocon file. Deploy binaries on post-merge.
2 parents dae9a10 + fffe600 commit a0552f0

File tree

1 file changed

+22
-9
lines changed

1 file changed

+22
-9
lines changed

ci.hocon

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ darwin : {
4848
}
4949
}
5050

51-
52-
deploy-dry-run : ${common} ${java8Downloads} {
53-
capabilities : [linux, amd64, gate]
54-
name : gate-deploy-dry-run
51+
maven-deploy-dry-run : ${common} ${java8Downloads} {
52+
capabilities : [linux, amd64]
53+
targets : [gate]
54+
name : gate-maven-deploy-dry-run
5555
setup : [
5656
["mx", "--strict-compliance", "build"]
5757
]
@@ -60,6 +60,18 @@ deploy-dry-run : ${common} ${java8Downloads} {
6060
]
6161
}
6262

63+
deploy-binary : ${common} ${java8Downloads} {
64+
capabilities : [linux, amd64]
65+
targets : [post-merge]
66+
name : postmerge-deploy-binary
67+
setup : [
68+
["mx", "--strict-compliance", "build"]
69+
]
70+
run : [
71+
["mx", "deploy-binary", "--skip-existing", "lafo-snapshots"]
72+
]
73+
}
74+
6375
java8Downloads : {
6476
downloads : {
6577
JDT : ${ecj}
@@ -88,11 +100,12 @@ gateLite : {
88100
}
89101

90102
builds = [
91-
${common} ${java8Downloads} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], capabilities : [linux, amd64, gate], name: "gate-truffle-8"},
92-
${common} ${java9Downloads} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], capabilities : [linux, amd64, gate], name: "gate-truffle-9"},
93-
${common} ${java8Downloads} {run : [["sh", ".travis.sigtest.sh"]], capabilities : [linux, amd64, gate], name: "gate-sigtest"},
94-
${common} ${java8Downloads} {run : [["mx", "testdownstream"]], capabilities : [linux, amd64, post-merge], name: "gate-downstream"},
95-
${deploy-dry-run}
103+
${common} ${java8Downloads} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], capabilities : [linux, amd64], targets : [gate], name: "gate-truffle-8"},
104+
${common} ${java9Downloads} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], capabilities : [linux, amd64], targets : [gate], name: "gate-truffle-9"},
105+
${common} ${java8Downloads} {run : [["sh", ".travis.sigtest.sh"]], capabilities : [linux, amd64], targets : [gate], name: "gate-sigtest"},
106+
${common} ${java8Downloads} {run : [["mx", "testdownstream"]], capabilities : [linux, amd64], targets : [post-merge], name: "gate-downstream"},
107+
${maven-deploy-dry-run}
108+
${deploy-binary}
96109
${solaris} ${java8Downloads} ${gateLite} {
97110
capabilities : [solaris, sparcv9],
98111
targets : [ gate ],

0 commit comments

Comments
 (0)