forked from JabRef/jabref-koppor
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'koppor:main' into main
- Loading branch information
Showing
92 changed files
with
829 additions
and
583 deletions.
There are no files selected for viewing
This file contains 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 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 |
|---|---|---|
|
|
@@ -38,15 +38,15 @@ jobs: | |
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| os: [ubuntu-latest, windows-latest, macos-latest] | ||
| os: [ubuntu-latest, windows-latest, macos-13] | ||
| include: | ||
| - os: ubuntu-latest | ||
| displayName: linux | ||
| archivePortable: tar -c -C build/distribution JabRef | pigz --rsyncable > build/distribution/JabRef-portable_linux.tar.gz && rm -R build/distribution/JabRef | ||
| - os: windows-latest | ||
| displayName: windows | ||
| archivePortable: 7z a -r build/distribution/JabRef-portable_windows.zip ./build/distribution/JabRef && rm -R build/distribution/JabRef | ||
| - os: macos-latest | ||
| - os: macos-13 # intel image | ||
| displayName: macOS | ||
| runs-on: ${{ matrix.os }} | ||
| outputs: | ||
|
|
@@ -96,25 +96,25 @@ jobs: | |
| gradle-home-cache-cleanup: true | ||
| - name: Prepare merged jars and modules dir (macOS) | ||
| # prepareModulesDir is executing a build, which should run through even if no upload to builds.jabref.org is made | ||
| if: (matrix.os == 'macos-latest') || (steps.checksecrets.outputs.secretspresent == 'NO') | ||
| if: (matrix.os == 'macos-13') || (steps.checksecrets.outputs.secretspresent == 'NO') | ||
| run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" prepareModulesDir | ||
| - name: Setup macOS key chain | ||
| if: (matrix.os == 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') | ||
| if: (matrix.os == 'macos-13') && (steps.checksecrets.outputs.secretspresent == 'YES') | ||
| uses: slidoapp/import-codesign-certs@1923310662e8682dd05b76b612b53301f431cd5d | ||
| with: | ||
| p12-file-base64: ${{ secrets.OSX_SIGNING_CERT }} | ||
| p12-password: ${{ secrets.OSX_CERT_PWD }} | ||
| keychain-password: jabref | ||
| - name: Setup macOS key chain for app id cert | ||
| if: (matrix.os == 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') | ||
| if: (matrix.os == 'macos-13') && (steps.checksecrets.outputs.secretspresent == 'YES') | ||
| 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 | ||
| - name: Build dmg (macOS) | ||
| if: (matrix.os == 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') | ||
| if: (matrix.os == 'macos-13') && (steps.checksecrets.outputs.secretspresent == 'YES') | ||
| shell: bash | ||
| run: | | ||
| jpackage \ | ||
|
|
@@ -151,7 +151,7 @@ jobs: | |
| --java-options --add-opens=javafx.controls/javafx.scene.control=org.jabref \ | ||
| --java-options --add-opens=javafx.controls/com.sun.javafx.scene.control=org.jabref | ||
| - name: Build pkg (macOS) | ||
| if: (matrix.os == 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') | ||
| if: (matrix.os == 'macos-13') && (steps.checksecrets.outputs.secretspresent == 'YES') | ||
| shell: bash | ||
| run: | | ||
| jpackage \ | ||
|
|
@@ -188,15 +188,15 @@ jobs: | |
| --java-options --add-opens=javafx.controls/javafx.scene.control=org.jabref \ | ||
| --java-options --add-opens=javafx.controls/com.sun.javafx.scene.control=org.jabref | ||
| - name: Build runtime image and installer (linux, Windows) | ||
| if: (matrix.os != 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') | ||
| if: (matrix.os != 'macos-13') && (steps.checksecrets.outputs.secretspresent == 'YES') | ||
| shell: bash | ||
| run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" jpackage jlinkZip | ||
| - name: Package application image (linux, Windows) | ||
| if: (matrix.os != 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') | ||
| if: (matrix.os != 'macos-13') && (steps.checksecrets.outputs.secretspresent == 'YES') | ||
| shell: bash | ||
| run: ${{ matrix.archivePortable }} | ||
| - name: Rename files | ||
| if: (matrix.os != 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') | ||
| if: (matrix.os != 'macos-13') && (steps.checksecrets.outputs.secretspresent == 'YES') | ||
| shell: pwsh | ||
| run: | | ||
| get-childitem -Path build/distribution/* | rename-item -NewName {$_.name -replace "${{ steps.gitversion.outputs.AssemblySemVer }}","${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}"} | ||
|
|
@@ -213,7 +213,7 @@ jobs: | |
| rm debian-binary control.tar.* data.tar.* | ||
| mv -f jabref_${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}_amd64_repackaged.deb jabref_${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}_amd64.deb | ||
| - name: Setup rsync (macOS) | ||
| if: ${{ (!startsWith(github.ref, 'refs/heads/gh-readonly-queue')) && (steps.checksecrets.outputs.secretspresent == 'YES') && ((matrix.os == 'macos-latest') && !((startsWith(github.ref, 'refs/tags/') || inputs.notarization == true))) }} | ||
| if: ${{ (!startsWith(github.ref, 'refs/heads/gh-readonly-queue')) && (steps.checksecrets.outputs.secretspresent == 'YES') && ((matrix.os == 'macos-13') && !((startsWith(github.ref, 'refs/tags/') || inputs.notarization == true))) }} | ||
| run: brew install rsync | ||
| - name: Setup rsync (Windows) | ||
| if: (matrix.os == 'windows-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') && (!startsWith(github.ref, 'refs/heads/gh-readonly-queue')) | ||
|
|
@@ -223,7 +223,7 @@ jobs: | |
| # We do not use egor-tensin/setup-cygwin@v4, because it replaces the default shell | ||
| run: choco install --no-progress rsync | ||
| - name: Setup SSH key | ||
| if: ${{ (steps.checksecrets.outputs.secretspresent == 'YES') && (!startsWith(github.ref, 'refs/heads/gh-readonly-queue')) && ((matrix.os != 'macos-latest') || !((startsWith(github.ref, 'refs/tags/') || (inputs.notarization == true)))) }} | ||
| if: ${{ (steps.checksecrets.outputs.secretspresent == 'YES') && (!startsWith(github.ref, 'refs/heads/gh-readonly-queue')) && ((matrix.os != 'macos-13') || !((startsWith(github.ref, 'refs/tags/') || (inputs.notarization == true)))) }} | ||
| run: | | ||
| echo "${{ secrets.buildJabRefPrivateKey }}" > sshkey | ||
| chmod 600 sshkey | ||
|
|
@@ -237,12 +237,12 @@ jobs: | |
| # macOS: Negated condition of "Upload to GitHub workflow artifacts store (macOS)" | ||
| # Reason: We either upload the non-notarized files - or notarize the files later (and upload these later) | ||
| # needs to be on one line; multi line does not work | ||
| if: ${{ (!startsWith(github.ref, 'refs/heads/gh-readonly-queue')) && (steps.checksecrets.outputs.secretspresent == 'YES') && ((matrix.os == 'ubuntu-latest') || ((matrix.os == 'macos-latest') && !((startsWith(github.ref, 'refs/tags/') || inputs.notarization == true)))) }} | ||
| if: ${{ (!startsWith(github.ref, 'refs/heads/gh-readonly-queue')) && (steps.checksecrets.outputs.secretspresent == 'YES') && ((matrix.os == 'ubuntu-latest') || ((matrix.os == 'macos-13') && !((startsWith(github.ref, 'refs/tags/') || inputs.notarization == true)))) }} | ||
| 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' build/distribution/ [email protected]:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/ | ||
| - name: Upload to GitHub workflow artifacts store (macOS) | ||
| if: (matrix.os == 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') && (startsWith(github.ref, 'refs/tags/') || inputs.notarization == true) | ||
| if: (matrix.os == 'macos-13') && (steps.checksecrets.outputs.secretspresent == 'YES') && (startsWith(github.ref, 'refs/tags/') || inputs.notarization == true) | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| # tbn = to-be-notarized | ||
|
|
@@ -283,7 +283,7 @@ jobs: | |
| mode: recreate | ||
| notarize: # outsourced in a separate job to be able to rerun if this fails for timeouts | ||
| name: macOS notarization | ||
| runs-on: macos-latest | ||
| runs-on: macos-13 | ||
| needs: [build] | ||
| if: ${{ startsWith(github.ref, 'refs/tags/') || inputs.notarization == true }} | ||
| steps: | ||
|
|
||
This file contains 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 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 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 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.