-
-
Notifications
You must be signed in to change notification settings - Fork 2.7k
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 321-fjournal-refactor
* upstream/main: (40 commits) Update guidelines-for-setting-up-a-local-workspace.md Add link to good first issues (and fix link) Refine guidelines (and fix .md file linking) Extend ArXiv fetcher results by using data from related DOIs (#9170) New Crowdin updates (#9366) Fix token New translations JabRef_en.properties (Chinese Simplified) (#9364) Fix date field change causes an uncaught exception (#9365) Add date format and respective test case (#9310) Bump jackson-datatype-jsr310 from 2.13.4 to 2.14.0 (#9357) Bump jackson-dataformat-yaml from 2.13.4 to 2.14.0 (#9356) Bump tika-core from 2.5.0 to 2.6.0 (#9358) Refine guideline "Set up a local workspace" (#9355) Adds missing "requires" statement (#9354) Bind "Find unlinked files" default directory to the current library (#9290) Rename "Remote" to "Tele" (#9270) Fixed display of file field adjusting for the dark theme (#9343) Update sorting of entries in maintable by special fields immediately (#9338) New translations JabRef_en.properties (German) (#9336) Fix Abbreviation for Escaped Ampersand (#9288) ... # Conflicts: # CHANGELOG.md
- Loading branch information
Showing
163 changed files
with
3,860 additions
and
1,469 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 |
|---|---|---|
|
|
@@ -31,7 +31,6 @@ concurrency: | |
| group: ${{ github.ref }} | ||
| cancel-in-progress: true | ||
|
|
||
|
|
||
| jobs: | ||
| build: | ||
| strategy: | ||
|
|
@@ -51,45 +50,58 @@ jobs: | |
| runs-on: ${{ matrix.os }} | ||
| name: Create installer and portable version for ${{ matrix.displayName }} | ||
| steps: | ||
| - name: Check secrets presence | ||
| id: checksecrets | ||
| shell: bash | ||
| run: | | ||
| if [ "$BUILDJABREFPRIVATEKEY" == "" ]; then | ||
| echo ::set-output name=secretspresent::false | ||
| else | ||
| echo ::set-output name=secretspresent::true | ||
| fi | ||
| env: | ||
| BUILDJABREFPRIVATEKEY: ${{ secrets.buildJabRefPrivateKey }} | ||
| - name: Fetch all history for all tags and branches | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| fetch-depth: 0 | ||
| - name: Install GitVersion | ||
| uses: gittools/actions/gitversion/[email protected].14 | ||
| uses: gittools/actions/gitversion/[email protected].15 | ||
| with: | ||
| versionSpec: "5.x" | ||
| - name: Run GitVersion | ||
| id: gitversion | ||
| uses: gittools/actions/gitversion/[email protected].14 | ||
| uses: gittools/actions/gitversion/[email protected].15 | ||
| - name: Set up JDK | ||
| uses: actions/setup-java@v3 | ||
| with: | ||
| java-version: 18 | ||
| distribution: 'temurin' | ||
| cache: 'gradle' | ||
| - name: Setup OSX key chain on OSX | ||
| if: matrix.os == 'macos-latest' | ||
| if: (matrix.os == 'macos-latest') && steps.checksecrets.outputs.secretspresent | ||
| 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' | ||
| if: (matrix.os == 'macos-latest') && steps.checksecrets.outputs.secretspresent | ||
| 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 | ||
| 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 | ||
| 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' | ||
| if: (matrix.os == 'macos-latest') && steps.checksecrets.outputs.secretspresent | ||
| 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 | ||
|
|
@@ -100,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/') | ||
| if: (matrix.os == 'macos-latest') && startsWith(github.ref, 'refs/tags/') && steps.checksecrets.outputs.secretspresent | ||
| 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}') | ||
|
|
@@ -157,12 +169,12 @@ jobs: | |
| - name: Fetch all history for all tags and branches | ||
| run: git fetch --prune --unshallow | ||
| - name: Install GitVersion | ||
| uses: gittools/actions/gitversion/[email protected].14 | ||
| uses: gittools/actions/gitversion/[email protected].15 | ||
| with: | ||
| versionSpec: '5.x' | ||
| - name: Run GitVersion | ||
| id: gitversion | ||
| uses: gittools/actions/gitversion/[email protected].14 | ||
| uses: gittools/actions/gitversion/[email protected].15 | ||
| - name: Get linux binaries | ||
| uses: actions/download-artifact@master | ||
| with: | ||
|
|
||
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 was deleted.
Oops, something went wrong.
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.