Skip to content

Commit 3f41bf0

Browse files
jpluscplusmcueckoo
authored andcommitted
internal/ci: install jextract
This makes the jextract tool (https://jdk.java.net/jextract/) available in CI, so that later commits can use it to regenerate the src/ directory. Signed-off-by: Jonathan Matthews <[email protected]> Change-Id: I448adaf0a0ffdf7e016ba4639fa8fdba9285b556 Dispatch-Trailer: {"type":"trybot","CL":1199057,"patchset":4,"ref":"refs/changes/57/1199057/4","targetBranch":"main"}
1 parent add593d commit 3f41bf0

File tree

2 files changed

+19
-3
lines changed

2 files changed

+19
-3
lines changed

.github/workflows/trybot.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,11 @@ jobs:
6666
with:
6767
cache: false
6868
go-version: ${{ matrix.go-version }}
69+
- name: Install Jextract
70+
uses: oracle-actions/setup-java@v1
71+
with:
72+
website: jdk.java.net
73+
release: jextract
6974
- name: Install Java
7075
uses: actions/setup-java@v4
7176
with:

internal/ci/github/trybot.cue

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ workflows: trybot: _repo.bashWorkflow & {
5151
for v in _repo.checkoutCode {v},
5252

5353
_installGo,
54+
_installJextract, // Jextract FIXME
5455
_installJava,
5556

5657
// cachePre must come after installing Go,
@@ -98,17 +99,27 @@ workflows: trybot: _repo.bashWorkflow & {
9899
}
99100
}
100101

102+
// cf. https://github.com/oracle-actions/setup-java?tab=readme-ov-file#download-and-install-an-early-access-build-of-a-named-openjdk-project
103+
_installJextract: json.#step & {
104+
name: "Install Jextract"
105+
uses: "oracle-actions/setup-java@v1"
106+
with: {
107+
website: "jdk.java.net"
108+
release: "jextract"
109+
}
110+
}
111+
101112
_checkoutLibcue: json.#step & {
102113
name: "Checkout libcue"
103114
uses: "actions/checkout@v4"
104115
with: {
105116
repository: "cue-lang/libcue"
106-
path: "libcue"
117+
path: "libcue"
107118
}
108119
}
109120

110121
_buildLibcue: json.#step & {
111-
name: "Build libcue"
122+
name: "Build libcue"
112123
"working-directory": "libcue"
113124
// The name of the shared library is target-dependent.
114125
// Build libcue with all possible names so we're covered
@@ -122,7 +133,7 @@ workflows: trybot: _repo.bashWorkflow & {
122133

123134
_mavenTest: json.#step & {
124135
name: "Test"
125-
env: LD_LIBRARY_PATH: "${{ github.workspace }}/libcue"
136+
env: LD_LIBRARY_PATH: "${{ github.workspace }}/libcue"
126137
env: DYLD_LIBRARY_PATH: "${{ github.workspace }}/libcue"
127138
run: "mvn clean install package"
128139
}

0 commit comments

Comments
 (0)