Skip to content

Commit 9d3a9ad

Browse files
brunoborgesCopilot
andcommitted
Simplify workflows: remove composite action, fallback to JBang on cache miss
- build-generator.yml: build JAR+AOT and save to actions cache directly - deploy.yml: restore from cache, use JAR+AOT if hit, fallback to JBang if miss - Remove .github/actions/build-generator composite action Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 028d5e0 commit 9d3a9ad

File tree

3 files changed

+39
-53
lines changed

3 files changed

+39
-53
lines changed

.github/actions/build-generator/action.yml

Lines changed: 0 additions & 49 deletions
This file was deleted.

.github/workflows/build-generator.yml

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ on:
55
branches: [main]
66
paths:
77
- '.github/workflows/build-generator.yml'
8-
- '.github/actions/build-generator/**'
98
- 'html-generators/generate.java'
109
schedule:
1110
- cron: '0 6 * * 1' # every Monday at 06:00 UTC
@@ -20,4 +19,24 @@ jobs:
2019
runs-on: ubuntu-latest
2120
steps:
2221
- uses: actions/checkout@v6
23-
- uses: ./.github/actions/build-generator
22+
23+
- uses: actions/setup-java@v5
24+
with:
25+
distribution: 'temurin'
26+
java-version: '25'
27+
28+
- uses: jbangdev/setup-jbang@main
29+
30+
- name: Build fat JAR
31+
run: jbang export fatjar --force --output html-generators/generate.jar html-generators/generate.java
32+
33+
- name: Build AOT cache
34+
run: java -XX:AOTCacheOutput=html-generators/generate.aot -jar html-generators/generate.jar
35+
36+
- name: Save to cache
37+
uses: actions/cache/save@v5
38+
with:
39+
path: |
40+
html-generators/generate.jar
41+
html-generators/generate.aot
42+
key: generator-${{ hashFiles('html-generators/generate.java') }}

.github/workflows/deploy.yml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,27 @@ jobs:
3434
distribution: 'temurin'
3535
java-version: '25'
3636

37-
- uses: ./.github/actions/build-generator
37+
- name: Restore cached JAR and AOT
38+
id: cache-restore
39+
uses: actions/cache/restore@v5
40+
with:
41+
path: |
42+
html-generators/generate.jar
43+
html-generators/generate.aot
44+
key: generator-${{ hashFiles('html-generators/generate.java') }}
3845

39-
- name: Generate HTML pages and snippets.json
46+
- name: Generate with cached JAR + AOT
47+
if: steps.cache-restore.outputs.cache-hit == 'true'
4048
run: java -XX:AOTCache=html-generators/generate.aot -jar html-generators/generate.jar
4149

50+
- name: Setup JBang (cache miss)
51+
if: steps.cache-restore.outputs.cache-hit != 'true'
52+
uses: jbangdev/setup-jbang@main
53+
54+
- name: Generate with JBang (cache miss)
55+
if: steps.cache-restore.outputs.cache-hit != 'true'
56+
run: jbang html-generators/generate.java
57+
4258
- name: Setup Pages
4359
uses: actions/configure-pages@v5
4460

0 commit comments

Comments
 (0)