Skip to content

Commit e0791e9

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":2,"ref":"refs/changes/57/1199057/2","targetBranch":"main"}
1 parent add593d commit e0791e9

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed

.github/workflows/trybot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,12 @@ jobs:
7171
with:
7272
distribution: temurin
7373
java-version: "22"
74+
- name: Install Jextract
75+
uses: oracle-actions/setup-java@v1
76+
with:
77+
website: jdk.java.net
78+
release: jextract
79+
version: jdk22
7480
- id: go-mod-cache-dir
7581
name: Get go mod cache directory
7682
run: echo "dir=$(go env GOMODCACHE)" >> ${GITHUB_OUTPUT}

internal/ci/github/trybot.cue

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ workflows: trybot: _repo.bashWorkflow & {
5252

5353
_installGo,
5454
_installJava,
55+
_installJextract,
5556

5657
// cachePre must come after installing Go,
5758
// because the cache locations
@@ -98,17 +99,28 @@ 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+
version: "jdk22"
110+
}
111+
}
112+
101113
_checkoutLibcue: json.#step & {
102114
name: "Checkout libcue"
103115
uses: "actions/checkout@v4"
104116
with: {
105117
repository: "cue-lang/libcue"
106-
path: "libcue"
118+
path: "libcue"
107119
}
108120
}
109121

110122
_buildLibcue: json.#step & {
111-
name: "Build libcue"
123+
name: "Build libcue"
112124
"working-directory": "libcue"
113125
// The name of the shared library is target-dependent.
114126
// Build libcue with all possible names so we're covered
@@ -122,7 +134,7 @@ workflows: trybot: _repo.bashWorkflow & {
122134

123135
_mavenTest: json.#step & {
124136
name: "Test"
125-
env: LD_LIBRARY_PATH: "${{ github.workspace }}/libcue"
137+
env: LD_LIBRARY_PATH: "${{ github.workspace }}/libcue"
126138
env: DYLD_LIBRARY_PATH: "${{ github.workspace }}/libcue"
127139
run: "mvn clean install package"
128140
}

0 commit comments

Comments
 (0)