Skip to content

Commit

Permalink
Migrate sdk to jsonnet.
Browse files Browse the repository at this point in the history
  • Loading branch information
fniephaus committed Oct 26, 2021
1 parent 4c4c954 commit d3bc5eb
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 22 deletions.
3 changes: 0 additions & 3 deletions ci.hocon
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ builds = []

binaries-repository = "lafo"

#SDK
include "sdk/ci.hocon"

#Truffle
include "truffle/ci.hocon"

Expand Down
4 changes: 4 additions & 0 deletions ci.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ local wasm = import 'wasm/ci.jsonnet';
# Espresso
local espresso = import 'espresso/ci.jsonnet';

# SDK
local sdk = import 'sdk/ci.jsonnet';

# Sulong
local sulong = import 'sulong/ci.jsonnet';

Expand All @@ -30,6 +33,7 @@ local add_excludes_guard(build) = build + {
compiler.builds +
wasm.builds +
espresso.builds +
sdk.builds +
sulong.builds +
javadoc.builds
)]
Expand Down
19 changes: 0 additions & 19 deletions sdk/ci.hocon

This file was deleted.

22 changes: 22 additions & 0 deletions sdk/ci.jsonnet
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
local common = import '../common.jsonnet',

local sdk_gate = {
name: 'gate-sdk-oraclejdk' + self.jdk_version + '-' + self.os + '-' + self.arch,
setup: [
["cd", "./sdk"],
],
run: [
["mx", "gate"]
],
targets: ["gate"],
timelimit: "30:00",
},

builds: [
common["linux-amd64"] + common.oraclejdk8 + sdk_gate + common.eclipse + common.jdt,
common["linux-amd64"] + common.oraclejdk11 + sdk_gate + common.eclipse,
common["linux-amd64"] + common.oraclejdk17 + sdk_gate + common.eclipse,
common["darwin-amd64"] + common.oraclejdk8 + sdk_gate,
]
}

0 comments on commit d3bc5eb

Please sign in to comment.