forked from JabRef/jabref
-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into refresh-csl
* main: (23 commits) fix tests New translations JabRef_en.properties (Portuguese, Brazilian) New translations JabRef_en.properties (Polish) New translations JabRef_en.properties (Dutch) add changelog Add Finnish (request on Mastodon) fix rsync branch name , fix duplicates CHANGELOG.md fix rsync Fixed togglegroups remvove obsolete Update journal abbreviation lists fix rsync Refine - and add debug Switch order (first rsync, then GitHub actions) Trigger workflow on push fix space fix quotes manual rsync uplod Remove portable archive ... # Conflicts: # src/main/resources/journals/journal-list.mv
- Loading branch information
Showing
11 changed files
with
335 additions
and
33 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 |
|---|---|---|
|
|
@@ -5,11 +5,12 @@ on: | |
| inputs: | ||
| notarization: | ||
| type: boolean | ||
| required: false | ||
| default: false | ||
| required: true | ||
| default: true | ||
| push: | ||
| branches: | ||
| - arm64mac-release | ||
| - updateArm64Notarization | ||
|
|
||
| env: | ||
| SpringerNatureAPIKey: ${{ secrets.SpringerNatureAPIKey }} | ||
|
|
@@ -34,7 +35,6 @@ jobs: | |
| - os: self-hosted | ||
| displayName: macOS (Arm64) | ||
| suffix: '_arm64' | ||
| archivePortable: tar -c -C build/distribution JabRef.app | pigz --rsyncable > build/distribution/JabRef-portable_macos_arm64.tar.gz && rm -R build/distribution/JabRef.app | ||
| runs-on: ${{ matrix.os }} | ||
| name: Create installer and portable version for ${{ matrix.displayName }} | ||
| steps: | ||
|
|
@@ -78,7 +78,7 @@ jobs: | |
| sed -i'.bak' -e "s/JavaLanguageVersion.of(20)/JavaLanguageVersion.of(21)/" build.gradle | ||
| - name: Clean up keychain | ||
| run: | | ||
| security delete-keychain signing_temp.keychain || true | ||
| security delete-keychain signing_temp.keychain ${{runner.temp}}/keychain/notarization.keychain || true | ||
| - name: Setup OSX key chain on OSX | ||
| uses: apple-actions/import-codesign-certs@v2 | ||
| with: | ||
|
|
@@ -92,8 +92,13 @@ jobs: | |
| p12-password: ${{ secrets.OSX_CERT_PWD }} | ||
| create-keychain: false | ||
| keychain-password: jabref | ||
| - name: Create notarization keychain | ||
| run: | | ||
| mkdir ${{runner.temp}}/keychain | ||
| security create-keychain -p jabref ${{runner.temp}}/keychain/notarization.keychain | ||
| security set-keychain-settings ${{runner.temp}}/keychain/notarization.keychain | ||
| - name: Prepare merged jars and modules dir (macos) | ||
| run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" prepareModulesDir | ||
| run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" prepareModulesDir | ||
| - name: Build dmg (macos) | ||
| shell: bash | ||
| run: | | ||
|
|
@@ -147,31 +152,27 @@ jobs: | |
| if: (startsWith(github.ref, 'refs/tags/') || (${{ inputs.notarization }})) | ||
| shell: bash | ||
| run: | | ||
| xcrun notarytool store-credentials "notarytool-profile" --apple-id "[email protected]" --team-id "6792V39SK3" --password "${{ secrets.OSX_NOTARIZATION_APP_PWD }}" | ||
| xcrun notarytool submit build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg --keychain-profile "notarytool-profile" --wait | ||
| xcrun notarytool store-credentials "notarytool-profile" --apple-id "[email protected]" --team-id "6792V39SK3" --password "${{ secrets.OSX_NOTARIZATION_APP_PWD }}" --keychain ${{runner.temp}}/keychain/notarization.keychain | ||
| xcrun notarytool submit build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg --keychain-profile "notarytool-profile" --keychain ${{runner.temp}}/keychain/notarization.keychain --wait | ||
| xcrun stapler staple build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg | ||
| - name: Notarize pkg | ||
| if: (startsWith(github.ref, 'refs/tags/') || (${{ inputs.notarization }})) | ||
| shell: bash | ||
| run: | | ||
| xcrun notarytool store-credentials "notarytool-profile" --apple-id "[email protected]" --team-id "6792V39SK3" --password "${{ secrets.OSX_NOTARIZATION_APP_PWD }}" | ||
| xcrun notarytool submit build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.pkg --keychain-profile "notarytool-profile" --wait | ||
| xcrun notarytool store-credentials "notarytool-profile" --apple-id "[email protected]" --team-id "6792V39SK3" --password "${{ secrets.OSX_NOTARIZATION_APP_PWD }}" --keychain ${{runner.temp}}/keychain/notarization.keychain | ||
| xcrun notarytool submit build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.pkg --keychain-profile "notarytool-profile" --keychain ${{runner.temp}}/keychain/notarization.keychain --wait | ||
| xcrun stapler staple build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.pkg | ||
| - name: Package application image | ||
| - name: Upload with rsync | ||
| shell: bash | ||
| run: ${{ matrix.archivePortable }} | ||
| run: | | ||
| mkdir ${{runner.temp}}/sshkey | ||
| if [[ -z "${{ secrets.buildJabRefPrivateKey }}" ]]; then | ||
| echo "buildJabRefPrivateKey is empty, exiting" | ||
| exit 1 | ||
| fi | ||
| rsync -Pavz --itemize-changes --stats --partial-dir=/tmp/partial --rsync-path="mkdir -p /var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }} && rsync" -e 'ssh -p 9922 -i ~/.ssh/id_rsa' build/distribution/ [email protected]:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/ | ||
| - name: Upload to GitHub workflow artifacts store | ||
| uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: JabRef-${{ matrix.displayName }} | ||
| path: build/distribution | ||
| - name: Upload to builds.jabref.org (TODO - won't run on Mac, because Dockerized action) | ||
| uses: Pendect/[email protected] | ||
| env: | ||
| DEPLOY_KEY: ${{ secrets.buildJabRefPrivateKey }} | ||
| with: | ||
| flags: -vaz --itemize-changes --stats --partial-dir=/tmp/partial --rsync-path="mkdir -p /var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }} && rsync" | ||
| options: '' | ||
| ssh_options: '-p 9922' | ||
| src: 'build/distribution/' | ||
| dest: [email protected]:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/ | ||
| path: build/distribution | ||
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
Binary file not shown.
Empty file.
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.