-
-
Notifications
You must be signed in to change notification settings - Fork 3k
[WIP] Enable Java EA builds and prepare JDK 26 #13937
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
koppor
wants to merge
98
commits into
main
Choose a base branch
from
jdk25
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+175
−308
Draft
Changes from 36 commits
Commits
Show all changes
98 commits
Select commit
Hold shift + click to select a range
c8ab7ce
Update to JDK25
koppor 9afbfe1
No more icon
koppor e6ec58d
Merge remote-tracking branch 'origin/main' into jdk25
koppor eeb401d
Try other icon file names
koppor 5ee1ebf
Merge remote-tracking branch 'origin/main' into jdk25
koppor a0a1fb9
Lowercase
koppor d061dee
Merge remote-tracking branch 'origin/main' into jdk25
koppor e19eeea
Remove *** from build output
koppor 4888971
Try to fix *.icns
koppor f714d92
Maybe all lowercase works
koppor d7f5171
Try to include more files
koppor e3554f2
Try JavaApp.icns
koppor 4558156
Try two times JabRef.icns
koppor 1234af3
Revert last changes
koppor 8dd46b1
Relative path for jabref.icns
koppor 84a9a01
Icon comes from other ways
koppor 5daa552
Fix path to .icns
koppor 49e6dae
Add missing dot
koppor 03437b2
Disable modernizer
koppor 7d3fd7a
No more JabKit (jbang works fine)
koppor 20aa273
Try to fix icons
koppor b254b9a
Update JBang
koppor 768bce0
Update JBang scripts
koppor 9910ffe
Revert "Try to fix icons"
koppor 2f73f53
Fix casing of JabRef.icns
koppor 292adc2
Merge branch 'main' into jdk25
koppor e1de30a
Merge branch 'main' into jdk25
koppor 50c9471
Merge remote-tracking branch 'upstream/main' into jdk25
Siedlerchr 886c48b
Try to fix notarization
koppor 9ec90b0
Fix notarization
koppor 053582a
Remove default Rutnime-Info.plist* files
koppor 2072159
Remove Info.plist*
koppor d392eaa
Remove Info-lite.plist*
koppor 31221f5
Linebreak in README.md
koppor 871bbca
Remove "public" for Java25 main methods
koppor 7d68cf8
Really remove public for JDK25 main methods
koppor 457f529
Fix "public"
koppor 5ffaed3
Merge branch 'main' into jdk25
Siedlerchr 2ac94d3
Let's try with JDK26 on macOS
koppor 6311de6
Switch from mise to ASDF
koppor 60d4d3b
Fix syntax
koppor 53f82cd
Try Oracle action
koppor 248c4ed
Fix path
koppor 397edc8
Try 26-ea instead of 26
koppor 8217617
Remove debug output
koppor 5e3de9f
Revert "Try 26-ea instead of 26"
koppor e1901cf
Switch JDK
koppor bfd528f
Try to add jdk.jsonobject
koppor 1b97662
Add JavaFX JMODs
koppor 97548e0
Update runners for notarization
koppor e6e1fb4
Merge remote-tracking branch 'origin/main' into jdk25
koppor 5a153b5
Fix labels
koppor c9e20d2
Try to remove empty jdk.jsobject dependency
koppor 010a2fe
Merge remote-tracking branch 'origin/main' into just-jdk25
koppor 5aa18fa
Try other syntax
koppor 4d83916
Revert "Try other syntax"
koppor 4727d32
Remove wrong jmod adding statement
koppor 0b79f2d
Try workaround for missing jdk.jsobject
koppor e4edcca
Revert "Try workaround for missing jdk.jsobject"
koppor 3c8a712
Revert "Remove wrong jmod adding statement"
koppor 7312c4a
Revert "Try to remove empty jdk.jsobject dependency"
koppor afec0a9
Try other workaround
koppor 5bd3939
Fix automatic module
koppor fb31aae
Enable crash output on console
koppor 32c68dc
Merge branch 'main' into jdk25
koppor e98ff24
Try to remove empty jdk.jsobject dependency
koppor 4747554
Revert "Fix automatic module"
koppor 0b76341
Revert "Enable crash output on console"
koppor 997484c
Add to modulepath only
koppor 21e2b56
Enable eaJdkBuild for all
koppor b886b1e
Fix Groovy vs. Kotlin
koppor 417cc44
Fix unzip
koppor c82e420
Fix sed command
koppor bef7f3f
Try to parameterize ea build
koppor 42fc331
Merge remote-tracking branch 'origin/main' into jdk25
koppor 262941e
Revert "Try to parameterize ea build"
koppor 9d281b2
Try to add eaJdk parameter (again)
koppor 04f973c
Refine icons
koppor eeba5b9
Creating GITHUB_STEP_SUMMARY
koppor 23e0c60
Fix \
koppor fefafd8
Extract jdk.jsobject.jmod only
koppor 4e4c8dc
Try / on Windows
koppor bf5719b
Keep directory struture
koppor 1f810ef
Merge remote-tracking branch 'origin/main' into jdk25
koppor 8b6885a
Merge remote-tracking branch 'origin/main' into just-jdk25
koppor 03fe025
Merge branch 'just-jdk25' into jdk25
koppor 6675f8e
Add hint on javafx update
koppor a347b2f
Merge branch 'main' into just-jdk25
koppor 634b4ac
Switch to Temurin in IntelliJ
koppor c13ee69
Merge branch 'just-jdk25' into jdk25
koppor 8389560
Merge remote-tracking branch 'origin/main' into just-jdk25
koppor a196c72
Add jabls to notarization
koppor 7d29c8f
Merge branch 'just-jdk25' into jdk25
koppor 6d8281d
Merge remote-tracking branch 'origin/main' into just-jdk25
koppor 28a6481
Merge branch 'just-jdk25' into jdk25
koppor c001f38
Merge branch 'main' into just-jdk25
koppor 049569f
Merge branch 'just-jdk25' into jdk25
koppor 292ef79
Update JMODs from ea+10 to ea+14
koppor File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -195,7 +195,7 @@ jobs: | |
| - name: Setup JDK | ||
| uses: actions/setup-java@v5 | ||
| with: | ||
| java-version: '24' | ||
| java-version: 25 | ||
| distribution: 'corretto' | ||
| check-latest: true | ||
| - name: Setup Gradle | ||
|
|
@@ -221,15 +221,15 @@ jobs: | |
| with: | ||
| p12-file-base64: ${{ secrets.OSX_SIGNING_CERT }} | ||
| p12-password: ${{ secrets.OSX_CERT_PWD }} | ||
| keychain-password: jabref | ||
| keychain-password: tEmPoRaRY-PaeSWD | ||
| - name: Setup macOS key chain for app id cert | ||
| if: (startsWith(matrix.os, 'macos')) && (needs.conditions.outputs.secretspresent == 'true') | ||
| uses: slidoapp/import-codesign-certs@1923310662e8682dd05b76b612b53301f431cd5d | ||
| with: | ||
| p12-file-base64: ${{ secrets.OSX_SIGNING_CERT_APPLICATION }} | ||
| p12-password: ${{ secrets.OSX_CERT_PWD }} | ||
| create-keychain: false | ||
| keychain-password: jabref | ||
| keychain-password: tEmPoRaRY-PaeSWD | ||
| - name: Build runtime image and installer | ||
| shell: bash | ||
| run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" :jabgui:jpackage | ||
|
|
@@ -256,15 +256,6 @@ jobs: | |
| rm debian-binary control.tar.* data.tar.* | ||
| mv -f jabref_${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}${{ matrix.suffix }}${{ matrix.archForDebianRepack }}_repackaged.deb jabref_${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}${{ matrix.suffix }}.deb | ||
|
|
||
| - name: Build JabKit | ||
| shell: bash | ||
| run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" :jabkit:jpackage | ||
| - name: Package JabKit application image | ||
| shell: bash | ||
| run: | | ||
| set -e | ||
| ${{ matrix.archivePortableJabKit }} | ||
|
|
||
| # region Upload to builds.jabref.org / GitHub artifacts store | ||
| - name: Setup SSH key | ||
| if: (needs.conditions.outputs.upload-to-builds-jabref-org == 'true') | ||
|
|
@@ -301,22 +292,11 @@ jobs: | |
| # for rsync installed by chocolatey, we need the ssh.exe delivered with that installation | ||
| run: | | ||
| rsync -rt --chmod=Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r --itemize-changes --stats --rsync-path="mkdir -p /var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }} && rsync" -e 'C:\ProgramData\chocolatey\lib\rsync\tools\bin\ssh.exe -p 9922 -i sshkey -o StrictHostKeyChecking=no' jabgui/build/packages/${{ matrix.os }}/ [email protected]:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/ || true | ||
| - name: Upload jabkkit to builds.jabref.org (Windows) | ||
| if: ${{ (steps.diskspace.outputs.available == 'true') && (matrix.os == 'windows-latest') }} | ||
| shell: cmd | ||
| # for rsync installed by chocolatey, we need the ssh.exe delivered with that installation | ||
| run: | | ||
| rsync -rt --chmod=Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r --itemize-changes --stats --rsync-path="mkdir -p /var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }} && rsync" -e 'C:\ProgramData\chocolatey\lib\rsync\tools\bin\ssh.exe -p 9922 -i sshkey -o StrictHostKeyChecking=no' jabkit/build/packages/${{ matrix.os }}/ [email protected]:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/ || true | ||
| - name: Upload jabgui to builds.jabref.org (linux, macOS) | ||
| if: ${{ (steps.diskspace.outputs.available == 'true') && (startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu')) }} | ||
| shell: bash | ||
| run: | | ||
| rsync -rt --chmod=Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r --itemize-changes --stats --rsync-path="mkdir -p /var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }} && rsync" -e 'ssh -p 9922 -i sshkey -o StrictHostKeyChecking=no' jabgui/build/packages/${{ matrix.os }}/ [email protected]:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/ || true | ||
| - name: Upload jabkit to builds.jabref.org (linux, macOS) | ||
| if: ${{ (steps.diskspace.outputs.available == 'true') && (startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu')) }} | ||
| shell: bash | ||
| run: | | ||
| rsync -rt --chmod=Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r --itemize-changes --stats --rsync-path="mkdir -p /var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }} && rsync" -e 'ssh -p 9922 -i sshkey -o StrictHostKeyChecking=no' jabkit/build/packages/${{ matrix.os }}/ [email protected]:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/ || true | ||
| - name: Upload to GitHub workflow artifacts store (macOS) | ||
| if: ${{ (startsWith(matrix.os, 'macos')) && (needs.conditions.outputs.should-notarize == 'true') }} | ||
| uses: actions/upload-artifact@v4 | ||
|
|
@@ -325,7 +305,6 @@ jobs: | |
| name: JabRef-${{ matrix.os }}-tbn | ||
| path: | | ||
| jabgui/build/packages/${{ matrix.os }} | ||
| jabkit/build/packages/${{ matrix.os }} | ||
| compression-level: 0 # no compression | ||
| # endregion | ||
|
|
||
|
|
@@ -408,24 +387,25 @@ jobs: | |
| uses: actions/download-artifact@v5 | ||
| with: | ||
| name: JabRef-${{ matrix.os }}-tbn | ||
| path: jabgui | ||
| - name: Notarize dmg | ||
| shell: bash | ||
| run: | | ||
| cd jabgui | ||
| find . -type f | ||
| xcrun notarytool store-credentials "notarytool-profile" --apple-id "[email protected]" --team-id "6792V39SK3" --password "${{ secrets.OSX_NOTARIZATION_APP_PWD }}" | ||
| xcrun notarytool submit packages/${{ matrix.os }}/JabRef-${{ needs.build.outputs.major }}.${{ needs.build.outputs.minor }}${{ matrix.suffix}}.dmg --keychain-profile "notarytool-profile" --wait | ||
| xcrun stapler staple packages/${{ matrix.os }}/JabRef-${{ needs.build.outputs.major }}.${{ needs.build.outputs.minor }}${{ matrix.suffix}}.dmg | ||
| xcrun notarytool submit JabRef-${{ needs.build.outputs.major }}.${{ needs.build.outputs.minor }}${{ matrix.suffix}}.dmg --keychain-profile "notarytool-profile" --wait | ||
| xcrun stapler staple JabRef-${{ needs.build.outputs.major }}.${{ needs.build.outputs.minor }}${{ matrix.suffix}}.dmg | ||
| - name: Notarize pkg | ||
| shell: bash | ||
| run: | | ||
| cd jabgui | ||
| xcrun notarytool store-credentials "notarytool-profile" --apple-id "[email protected]" --team-id "6792V39SK3" --password "${{ secrets.OSX_NOTARIZATION_APP_PWD }}" | ||
| xcrun notarytool submit packages/${{ matrix.os }}/JabRef-${{ needs.build.outputs.major }}.${{ needs.build.outputs.minor }}${{ matrix.suffix}}.pkg --keychain-profile "notarytool-profile" --wait | ||
| xcrun stapler staple packages/${{ matrix.os }}/JabRef-${{ needs.build.outputs.major }}.${{ needs.build.outputs.minor }}${{ matrix.suffix}}.pkg | ||
| xcrun notarytool submit JabRef-${{ needs.build.outputs.major }}.${{ needs.build.outputs.minor }}${{ matrix.suffix}}.pkg --keychain-profile "notarytool-profile" --wait | ||
| xcrun stapler staple JabRef-${{ needs.build.outputs.major }}.${{ needs.build.outputs.minor }}${{ matrix.suffix}}.pkg | ||
| - name: Upload to builds.jabref.org | ||
| shell: bash | ||
| run: | | ||
| echo "${{ secrets.buildJabRefPrivateKey }}" > sshkey | ||
| chmod 600 sshkey | ||
| rsync -rt --chmod=Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r --itemize-changes --stats --rsync-path="mkdir -p /var/www/builds.jabref.org/www/${{ needs.build.outputs.branchname }} && rsync" -e 'ssh -p 9922 -i sshkey -o StrictHostKeyChecking=no' jabgui/build/packages/${{ matrix.os }}/ [email protected]:/var/www/builds.jabref.org/www/${{ needs.build.outputs.branchname }}/ | ||
| rsync -rt --chmod=Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r --itemize-changes --stats --rsync-path="mkdir -p /var/www/builds.jabref.org/www/${{ needs.build.outputs.branchname }} && rsync" -e 'ssh -p 9922 -i sshkey -o StrictHostKeyChecking=no' jabgui/ [email protected]:/var/www/builds.jabref.org/www/${{ needs.build.outputs.branchname }}/ | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| specs: specs.moderne.ai/v1/cli | ||
| java: | ||
| selectedJdk: '24' | ||
| selectedJdk: '25' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| java=24.0.2-amzn | ||
| java=25-amzn | ||
| #visualvm=2.1.10 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.