-
-
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
base: main
Are you sure you want to change the base?
Changes from 27 commits
c8ab7ce
9afbfe1
e6ec58d
eeb401d
5ee1ebf
a0a1fb9
d061dee
e19eeea
4888971
f714d92
d7f5171
e3554f2
4558156
1234af3
8dd46b1
84a9a01
5daa552
49e6dae
03437b2
7d3fd7a
20aa273
b254b9a
768bce0
9910ffe
2f73f53
292adc2
e1de30a
50c9471
886c48b
9ec90b0
053582a
2072159
d392eaa
31221f5
871bbca
7d68cf8
457f529
5ffaed3
2ac94d3
6311de6
60d4d3b
53f82cd
248c4ed
397edc8
8217617
5e3de9f
e1901cf
bfd528f
1b97662
97548e0
e6e1fb4
5a153b5
c9e20d2
010a2fe
5aa18fa
4d83916
4727d32
0b79f2d
e4edcca
3c8a712
7312c4a
afec0a9
5bd3939
fb31aae
32c68dc
e98ff24
4747554
0b76341
997484c
21e2b56
b886b1e
417cc44
c82e420
bef7f3f
42fc331
262941e
9d281b2
04f973c
eeba5b9
23e0c60
fefafd8
4e4c8dc
bf5719b
1f810ef
8b6885a
03fe025
6675f8e
a347b2f
634b4ac
c13ee69
8389560
a196c72
7d29c8f
6d8281d
28a6481
c001f38
049569f
292ef79
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| 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 | ||
|
|
||
|
|
||
| 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' |
| 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 |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -191,7 +191,7 @@ javaModulePackaging { | |
| } | ||
| targetsWithOs("macos") { | ||
| options.addAll( | ||
| "--icon", "$projectDir/src/main/resources/icons/jabref.icns", | ||
| "--icon", "$projectDir/buildres/macos/JabRef.icns", | ||
| "--mac-package-identifier", "JabRef", | ||
| "--mac-package-name", "JabRef", | ||
| "--file-associations", "$projectDir/buildres/macos/bibtexAssociations.properties", | ||
|
|
@@ -200,7 +200,7 @@ javaModulePackaging { | |
| options.addAll( | ||
| "--mac-sign", | ||
| "--mac-signing-key-user-name", "JabRef e.V. (6792V39SK3)", | ||
| "--mac-package-signing-prefix", "org.jabref", | ||
| "--mac-package-signing-prefix", "org.jabref.", | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why the dot? This is for signing There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Okay, weird There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's the thing put before names without "namespace". E.g., "App" becomes |
||
| ) | ||
| } | ||
| targetResources.from(layout.projectDirectory.dir("buildres/macos").asFileTree.matching { | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
| extension=bib | ||
| mime-type=text/x-bibtex | ||
| description=BibTeX File | ||
| icon=jabref.icns |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| jdk: | ||
| - openjdk24 | ||
| - openjdk25 | ||
| install: | ||
| - ./gradlew :versions:publishToMavenLocal | ||
| - ./gradlew :jablib:publishToMavenLocal |
Uh oh!
There was an error while loading. Please reload this page.