forked from JabRef/jabref
-
Notifications
You must be signed in to change notification settings - Fork 15
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 JUnit5BestPractices
- Loading branch information
Showing
293 changed files
with
4,571 additions
and
1,948 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
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 |
---|---|---|
|
@@ -26,7 +26,7 @@ jobs: | |
BUILDJABREFPRIVATEKEY: ${{ secrets.buildJabRefPrivateKey }} | ||
- name: Delete folder on builds.jabref.org | ||
if: steps.checksecrets.outputs.secretspresent == 'YES' | ||
uses: appleboy/[email protected].0 | ||
uses: appleboy/[email protected].3 | ||
with: | ||
script: rm -rf /var/www/builds.jabref.org/www/pull/${{ github.event.pull_request.number }} || 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 |
---|---|---|
|
@@ -22,7 +22,7 @@ env: | |
JAVA_OPTS: -Xmx4g | ||
|
||
concurrency: | ||
group: ${{ github.workflow }}-${{ github.ref }} | ||
group: "${{ github.workflow }}-${{ github.head_ref || github.ref }}" | ||
cancel-in-progress: true | ||
|
||
jobs: | ||
|
@@ -59,11 +59,10 @@ jobs: | |
id: gitversion | ||
uses: gittools/actions/gitversion/[email protected] | ||
- name: Setup JDK | ||
uses: actions/setup-java@v3 | ||
uses: actions/setup-java@v4 | ||
with: | ||
java-version: 21.0.1 | ||
distribution: 'liberica' | ||
cache: 'gradle' | ||
- name: Clean up keychain | ||
run: | | ||
security delete-keychain signing_temp.keychain ${{runner.temp}}/keychain/notarization.keychain || true | ||
|
@@ -85,6 +84,8 @@ jobs: | |
mkdir ${{runner.temp}}/keychain | ||
security create-keychain -p jabref ${{runner.temp}}/keychain/notarization.keychain | ||
security set-keychain-settings ${{runner.temp}}/keychain/notarization.keychain | ||
- name: Setup Gradle | ||
uses: gradle/gradle-build-action@v2 | ||
- name: Prepare merged jars and modules dir (macOS) | ||
run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" prepareModulesDir | ||
- name: Build dmg (macOS) | ||
|
@@ -161,7 +162,7 @@ jobs: | |
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 | ||
if: ${{ !startsWith(github.ref, 'refs/heads/gh-readonly-queue') }} | ||
uses: actions/upload-artifact@v3 | ||
uses: actions/upload-artifact@v4 | ||
with: | ||
name: JabRef-${{ matrix.displayName }} | ||
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -31,7 +31,7 @@ env: | |
JDK21: "" | ||
|
||
concurrency: | ||
group: ${{ github.workflow }}-${{ github.ref }} | ||
group: "${{ github.workflow }}-${{ github.head_ref || github.ref }}" | ||
cancel-in-progress: true | ||
|
||
jobs: | ||
|
@@ -90,11 +90,12 @@ jobs: | |
id: gitversion | ||
uses: gittools/actions/gitversion/[email protected] | ||
- name: Setup JDK | ||
uses: actions/setup-java@v3 | ||
uses: actions/setup-java@v4 | ||
with: | ||
java-version: 21.0.1 | ||
distribution: 'liberica' | ||
cache: 'gradle' | ||
- name: Setup Gradle | ||
uses: gradle/gradle-build-action@v2 | ||
- name: Prepare merged jars and modules dir (macOS) | ||
if: (matrix.os == 'macos-latest') || (steps.checksecrets.outputs.secretspresent == 'NO') | ||
run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" prepareModulesDir | ||
|
@@ -219,14 +220,14 @@ jobs: | |
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) | ||
uses: actions/upload-artifact@v3 | ||
uses: actions/upload-artifact@v4 | ||
with: | ||
# tbn = to-be-notarized | ||
name: JabRef-macOS-tbn | ||
path: build/distribution | ||
- name: Upload to GitHub workflow artifacts store | ||
if: (steps.checksecrets.outputs.secretspresent != 'YES') | ||
uses: actions/upload-artifact@v3 | ||
uses: actions/upload-artifact@v4 | ||
with: | ||
# tbn = to-be-notarized | ||
name: JabRef-${{ matrix.os }} | ||
|
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,15 @@ | ||
[submodule "buildres/abbrv.jabref.org"] | ||
[submodule "abbrv.jabref.org"] | ||
path = buildres/abbrv.jabref.org | ||
url = https://github.com/JabRef/abbrv.jabref.org.git | ||
[submodule "buildres/csl-styles"] | ||
ignore = all | ||
shallow = true | ||
[submodule "csl-styles"] | ||
path = src/main/resources/csl-styles | ||
url = https://github.com/citation-style-language/styles.git | ||
[submodule "buildres/csl-locales"] | ||
ignore = all | ||
shallow = true | ||
[submodule "csl-locales"] | ||
path = src/main/resources/csl-locales | ||
url = https://github.com/citation-style-language/locales.git | ||
ignore = all | ||
shallow = true |
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.