Skip to content

Commit 2d9c083

Browse files
author
alferio
committed
fix(ci): msi build fails
Patched .github/workflows/release.yml. - MSI failure: removed --java-options from the jpackage --type msi invocation at .github/workflows/release.yml:75. - That option is valid on the app-image step, not on the MSI packaging step. - The heap settings remain baked into the app-image created at .github/workflows/release.yml:63, and the MSI is built from that app-image. - Node 20 deprecation warnings: upgraded the workflow actions to Node 24-capable majors. - actions/checkout@v4 -> actions/checkout@v5 - actions/setup-java@v4 -> actions/setup-java@v5 - updated across the release workflow at .github/workflows/release.yml:25, .github/workflows/release.yml:43, .github/workflows/release.yml:270, .github/ workflows/release.yml:285, .github/workflows/release.yml:328, .github/workflows/release.yml:346
1 parent 98311d8 commit 2d9c083

3 files changed

Lines changed: 14 additions & 15 deletions

File tree

.github/workflows/release.yml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ jobs:
2222
build-linux:
2323
runs-on: ubuntu-latest
2424
steps:
25-
- uses: actions/checkout@v4
26-
- uses: actions/setup-java@v4
25+
- uses: actions/checkout@v5
26+
- uses: actions/setup-java@v5
2727
with:
2828
distribution: "temurin"
2929
java-version: "21"
@@ -40,8 +40,8 @@ jobs:
4040
build-windows:
4141
runs-on: windows-latest
4242
steps:
43-
- uses: actions/checkout@v4
44-
- uses: actions/setup-java@v4
43+
- uses: actions/checkout@v5
44+
- uses: actions/setup-java@v5
4545
with:
4646
distribution: "temurin"
4747
java-version: "21"
@@ -74,8 +74,7 @@ jobs:
7474
Copy-Item "docs\tutorial\*" $tutorialsDir -Recurse -Force
7575
& $jpackage --type msi --name $appName --app-version $version --vendor "alfu32" `
7676
--app-image $appImage --dest "dist\installer" `
77-
--icon "lwjgl3\icons\logo.ico" --win-per-user-install --win-menu --win-shortcut `
78-
--java-options "-Xms512m" --java-options "-Xmx6g"
77+
--icon "lwjgl3\icons\logo.ico" --win-per-user-install --win-menu --win-shortcut
7978
- name: Prepare MSIX layout
8079
shell: powershell
8180
run: |
@@ -268,8 +267,8 @@ jobs:
268267
build-mac:
269268
runs-on: macos-14
270269
steps:
271-
- uses: actions/checkout@v4
272-
- uses: actions/setup-java@v4
270+
- uses: actions/checkout@v5
271+
- uses: actions/setup-java@v5
273272
with:
274273
distribution: "temurin"
275274
java-version: "21"
@@ -283,8 +282,8 @@ jobs:
283282
build-android:
284283
runs-on: ubuntu-latest
285284
steps:
286-
- uses: actions/checkout@v4
287-
- uses: actions/setup-java@v4
285+
- uses: actions/checkout@v5
286+
- uses: actions/setup-java@v5
288287
with:
289288
distribution: "temurin"
290289
java-version: "21"
@@ -326,8 +325,8 @@ jobs:
326325
build-web:
327326
runs-on: ubuntu-latest
328327
steps:
329-
- uses: actions/checkout@v4
330-
- uses: actions/setup-java@v4
328+
- uses: actions/checkout@v5
329+
- uses: actions/setup-java@v5
331330
with:
332331
distribution: "temurin"
333332
java-version: "21"
@@ -344,7 +343,7 @@ jobs:
344343
runs-on: ubuntu-latest
345344
needs: [build-linux, build-windows, build-mac, build-android, build-web]
346345
steps:
347-
- uses: actions/checkout@v4
346+
- uses: actions/checkout@v5
348347
- uses: actions/download-artifact@v4
349348
with:
350349
path: artifacts

web/build/dist/webapp/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<title>Octodraw 4.7.1</title>
4+
<title>Octodraw 4.7.2</title>
55
<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
66
<style>
77
body {
@@ -29,6 +29,6 @@
2929
}
3030
window.addEventListener("load", start);
3131
</script>
32-
<script type="text/javascript" charset="utf-8" src="octodraw-4.7.1.js"></script>
32+
<script type="text/javascript" charset="utf-8" src="octodraw-4.7.2.js"></script>
3333
</body>
3434
</html>
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)