forked from JabRef/jabref
-
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 remote-tracking branch 'upstream/main' into import_into_library
* upstream/main: (37 commits) Update database context in state manager after loading (JabRef#9450) Bump classgraph from 4.8.151 to 4.8.152 (JabRef#9448) Bump appleboy/ssh-action from 0.1.5 to 0.1.6 (JabRef#9443) Bump Pendect/action-rsyncer from 1.1.0 to 2.0.0 (JabRef#9444) Bump jackson-dataformat-yaml from 2.14.0 to 2.14.1 (JabRef#9445) Bump unirest-java from 3.14.0 to 3.14.1 (JabRef#9447) Bump postgresql from 42.5.0 to 42.5.1 (JabRef#9446) New Crowdin updates (JabRef#9435) Return absolute path in case an absolute one is given (JabRef#9433) New Crowdin updates (JabRef#9434) Fix for issue: right click menu 6601 (JabRef#9271) Fix modernizer and refactor protected terms (JabRef#9427) Observable Preferences (OpenOffice) (JabRef#9422) Allow users to review backup changes before restoring them or merge them selectively (JabRef#9311) Bump slf4j-api from 2.0.4 to 2.0.5 (JabRef#9428) Bump archunit-junit5-api from 1.0.0 to 1.0.1 (JabRef#9429) Bump jackson-datatype-jsr310 from 2.14.0 to 2.14.1 (JabRef#9430) Bump lucene-highlighter from 9.4.1 to 9.4.2 (JabRef#9431) Fix weird checkbox styling (JabRef#9425) New translations JabRef_en.properties (Italian) (JabRef#9424) ...
- Loading branch information
Showing
135 changed files
with
1,872 additions
and
1,190 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,9 +14,9 @@ jobs: | |
| shell: bash | ||
| run: | | ||
| if [ "$BUILDJABREFPRIVATEKEY" == "" ]; then | ||
| echo "secretspresent=false" >> $GITHUB_OUTPUT | ||
| echo "secretspresent=NO" >> $GITHUB_OUTPUT | ||
| else | ||
| echo "secretspresent=true" >> $GITHUB_OUTPUT | ||
| echo "secretspresent=YES" >> $GITHUB_OUTPUT | ||
| fi | ||
| env: | ||
| BUILDJABREFPRIVATEKEY: ${{ secrets.buildJabRefPrivateKey }} | ||
|
|
@@ -26,8 +26,8 @@ jobs: | |
| run: | | ||
| echo "branch=${{ github.event.pull_request.head.ref }}" >> $GITHUB_OUTPUT | ||
| - name: Delete folder on builds.jabref.org | ||
| if: ${{ steps.checksecrets.outputs.secretspresent }} | ||
| uses: appleboy/[email protected].5 | ||
| if: steps.checksecrets.outputs.secretspresent == 'YES' | ||
| uses: appleboy/[email protected].6 | ||
| with: | ||
| script: rm -rf /var/www/builds.jabref.org/www/${{ steps.extract_branch.outputs.branch }} || true | ||
| host: build-upload.jabref.org | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -55,9 +55,9 @@ jobs: | |
| shell: bash | ||
| run: | | ||
| if [ "$BUILDJABREFPRIVATEKEY" == "" ]; then | ||
| echo "secretspresent=false" >> $GITHUB_OUTPUT | ||
| echo "secretspresent=NO" >> $GITHUB_OUTPUT | ||
| else | ||
| echo "secretspresent=true" >> $GITHUB_OUTPUT | ||
| echo "secretspresent=YES" >> $GITHUB_OUTPUT | ||
| fi | ||
| env: | ||
| BUILDJABREFPRIVATEKEY: ${{ secrets.buildJabRefPrivateKey }} | ||
|
|
@@ -79,29 +79,29 @@ jobs: | |
| distribution: 'temurin' | ||
| cache: 'gradle' | ||
| - name: Setup OSX key chain on OSX | ||
| if: (matrix.os == 'macos-latest') && steps.checksecrets.outputs.secretspresent | ||
| if: (matrix.os == 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') | ||
| uses: apple-actions/import-codesign-certs@v1 | ||
| with: | ||
| p12-file-base64: ${{ secrets.OSX_SIGNING_CERT }} | ||
| p12-password: ${{ secrets.OSX_CERT_PWD }} | ||
| keychain-password: jabref | ||
| - name: Setup OSX key chain on OSX for app id cert | ||
| if: (matrix.os == 'macos-latest') && steps.checksecrets.outputs.secretspresent | ||
| if: (matrix.os == 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') | ||
| uses: apple-actions/import-codesign-certs@v1 | ||
| with: | ||
| p12-file-base64: ${{ secrets.OSX_SIGNING_CERT_APPLICATION }} | ||
| p12-password: ${{ secrets.OSX_CERT_PWD }} | ||
| create-keychain: false | ||
| keychain-password: jabref | ||
| - name: Build runtime image | ||
| if: (matrix.os != 'macos-latest') || steps.checksecrets.outputs.secretspresent | ||
| if: (matrix.os != 'macos-latest') || (steps.checksecrets.outputs.secretspresent == 'YES') | ||
| run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" jlinkZip | ||
| - name: Build installer | ||
| if: (matrix.os != 'macos-latest') || steps.checksecrets.outputs.secretspresent | ||
| if: (matrix.os != 'macos-latest') || (steps.checksecrets.outputs.secretspresent == 'YES') | ||
| run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" jpackage | ||
| shell: bash | ||
| - name: Resign app image for OSX and build dmg | ||
| if: (matrix.os == 'macos-latest') && steps.checksecrets.outputs.secretspresent | ||
| if: (matrix.os == 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') | ||
| shell: bash | ||
| run: | | ||
| codesign --entitlements buildres/mac/jabref.entitlements --options runtime -vvv -f --sign "Developer ID Application: JabRef e.V. (6792V39SK3)" build/distribution/JabRef.app/Contents/runtime/Contents/MacOS/libjli.dylib | ||
|
|
@@ -112,7 +112,7 @@ jobs: | |
| jpackage --type pkg --dest build/distribution --name JabRef --mac-package-identifier JabRef --app-version "${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}" --app-image build/distribution/JabRef.app --verbose --type pkg --vendor JabRef --app-version "${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}" --file-associations buildres/mac/bibtexAssociations.properties --resource-dir buildres/mac | ||
| productsign --sign "Developer ID Installer: JabRef e.V. (6792V39SK3)" "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.pkg" "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-signed.pkg" | ||
| - name: Notarize dmg and pkg installer | ||
| if: (matrix.os == 'macos-latest') && startsWith(github.ref, 'refs/tags/') && steps.checksecrets.outputs.secretspresent | ||
| if: (matrix.os == 'macos-latest') && startsWith(github.ref, 'refs/tags/') && (steps.checksecrets.outputs.secretspresent == 'YES') | ||
| shell: bash | ||
| run: | | ||
| REQUEST_UUID_DMG=$(xcrun altool --verbose --notarize-app --primary-bundle-id "org.jabref" --username ${{ secrets.OSX_NOTARIZATION_APP_USERNAME }} --password ${{ secrets.OSX_NOTARIZATION_APP_PWD }} --asc-provider "6792V39SK3" --file "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg" | grep RequestUUID | awk '{print $3}') | ||
|
|
@@ -133,15 +133,17 @@ jobs: | |
| rm "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.pkg" | ||
| mv "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-signed.pkg" "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.pkg" | ||
| - name: Package application image | ||
| if: (matrix.os != 'macos-latest') || (steps.checksecrets.outputs.secretspresent == 'YES') | ||
| shell: bash | ||
| run: ${{ matrix.archivePortable }} | ||
| - name: Rename files | ||
| if: (matrix.os != 'macos-latest') || (steps.checksecrets.outputs.secretspresent == 'YES') | ||
| shell: pwsh | ||
| run: | | ||
| get-childitem -Path build/distribution/* | ||
| get-childitem -Path build/distribution/* | rename-item -NewName {$_.name -replace "${{ steps.gitversion.outputs.AssemblySemVer }}","${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}"} | ||
| get-childitem -Path build/distribution/* | rename-item -NewName {$_.name -replace "portable","${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-portable"} | ||
| - name: Upload to GitHub workflow artifacts store | ||
| if: (matrix.os != 'macos-latest') || (steps.checksecrets.outputs.secretspresent == 'YES') | ||
| uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: JabRef-${{ matrix.displayName }} | ||
|
|
@@ -158,42 +160,49 @@ jobs: | |
| shell: bash | ||
| run: | | ||
| if [ "$BUILDJABREFPRIVATEKEY" == "" ]; then | ||
| echo "secretspresent=false" >> $GITHUB_OUTPUT | ||
| echo "secretspresent=NO" >> $GITHUB_OUTPUT | ||
| else | ||
| echo "secretspresent=true" >> $GITHUB_OUTPUT | ||
| echo "secretspresent=YES" >> $GITHUB_OUTPUT | ||
| fi | ||
| env: | ||
| BUILDJABREFPRIVATEKEY: ${{ secrets.buildJabRefPrivateKey }} | ||
| - name: Checkout source | ||
| if: steps.checksecrets.outputs.secretspresent == 'YES' | ||
| uses: actions/checkout@v3 | ||
| - name: Fetch all history for all tags and branches | ||
| if: steps.checksecrets.outputs.secretspresent == 'YES' | ||
| run: git fetch --prune --unshallow | ||
| - name: Install GitVersion | ||
| if: steps.checksecrets.outputs.secretspresent == 'YES' | ||
| uses: gittools/actions/gitversion/[email protected] | ||
| with: | ||
| versionSpec: '5.x' | ||
| - name: Run GitVersion | ||
| if: steps.checksecrets.outputs.secretspresent == 'YES' | ||
| id: gitversion | ||
| uses: gittools/actions/gitversion/[email protected] | ||
| - name: Get linux binaries | ||
| if: steps.checksecrets.outputs.secretspresent == 'YES' | ||
| uses: actions/download-artifact@master | ||
| with: | ||
| name: JabRef-linux | ||
| path: build/distribution | ||
| - name: Get windows binaries | ||
| if: steps.checksecrets.outputs.secretspresent == 'YES' | ||
| uses: actions/download-artifact@master | ||
| with: | ||
| name: JabRef-windows | ||
| path: build/distribution | ||
| - name: Get macOS binaries | ||
| if: steps.checksecrets.outputs.secretspresent == 'YES' | ||
| uses: actions/download-artifact@master | ||
| with: | ||
| name: JabRef-macOS | ||
| path: build/distribution/ | ||
| - name: Deploy to builds.jabref.org | ||
| id: deploy | ||
| if: ${{ steps.checksecrets.outputs.secretspresent }} | ||
| uses: Pendect/action-rsyncer@v1.1.0 | ||
| if: steps.checksecrets.outputs.secretspresent == 'YES' | ||
| uses: Pendect/action-rsyncer@v2.0.0 | ||
| env: | ||
| DEPLOY_KEY: ${{ secrets.buildJabRefPrivateKey }} | ||
| BRANCH: ${{ steps.gitversion.outputs.branchName }} | ||
|
|
||
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
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.