Skip to content

Commit 5291f65

Browse files
authored
Merge branch 'main' into feat/11377
2 parents 0141fa5 + 0c1132d commit 5291f65

File tree

717 files changed

+7807
-6405
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

717 files changed

+7807
-6405
lines changed

.git-blame-ignore-revs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Automatic code reformatting
2+
f3cfa496e028dee1cafd0c47553f63cd1243bd8c
23
c5bcad738fe6e8dfcb62442a426c2778241515a1
4+
10189bf2c1a6bc506f03461390f3cc46e5cc0651
5+
16fd6194b9a0b8282259c00b6fb0d4aa494e4b04
36

47
# net.sf.jabref -> org.jabref
58
b2ad6eb279f5def38fa21be12cb5dd4545c1ba1a
@@ -23,6 +26,6 @@ bf81b595a77f0f7f254872be6f05a063c44528d8
2326

2427
# This commit should not exist
2528
185d7345946c29a2a4e2726c912be0c4db4810b9
26-
# Resulted in this problematic merge commits
29+
# ... and resulted in this problematic merge commits
2730
7e1645978b3028df5e65af19f0f819ddfd0f24aa
2831
a31f396765492ac12eaab228e33eb9d22487403b

.github/ghprcomment.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,16 @@
3939
4040
You can then run these tests in IntelliJ to reproduce the failing tests locally.
4141
We offer a quick test running howto in the section [Final build system checks](https://devdocs.jabref.org/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-12-build.html#final-build-system-checks) in our setup guide.
42+
- jobName: format
43+
workflowName: 'Source Code Tests'
44+
message: >
45+
Your code currently does not meet JabRef's code guidelines.
46+
IntelliJ auto format covers some cases.
47+
There seem to be issues with your code style and autoformat configuration.
48+
Please reformat your code (<kbd>Ctrl</kbd>+<kbd>Alt</kbd>+<kbd>L</kbd>) and commit, then push.
49+
50+
51+
In special cases, consider using `// formatter:off` and `// formatter:on` annotations to allow deviation from the code style.
4252
- jobName: Checkstyle
4353
workflowName: 'Source Code Tests'
4454
message: >

.github/workflows/automerge.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,21 @@ jobs:
1414
id: shouldrun
1515
shell: bash
1616
run: |
17-
actor='${{ github.actor }}'
18-
title='${{ github.event.pull_request.title }}'
19-
20-
if [[ "$actor" == "renovate-bot" ]]; then
21-
echo "✅ from renote-bot"
22-
echo "shouldrun=true" >> "$GITHUB_OUTPUT"
23-
exit 0
24-
fi
25-
2617
head_repo="${{ github.event.pull_request.head.repo.full_name }}"
2718
if [[ "$head_repo" != "JabRef/jabref" ]]; then
2819
echo "🚫 not from JabRef/jabref"
2920
echo "shouldrun=false" >> "$GITHUB_OUTPUT"
3021
exit 0
3122
fi
3223
24+
actor="${{ github.actor }}"
25+
if [[ "$actor" == "renovate-bot" ]]; then
26+
echo "✅ from renote-bot"
27+
echo "shouldrun=true" >> "$GITHUB_OUTPUT"
28+
exit 0
29+
fi
30+
31+
title="${{ github.event.pull_request.title }}"
3332
if [[ "$actor" == "dependabot[bot]" ]] || \
3433
[[ "$title" == "[Bot] "* ]] || \
3534
[[ "$title" == "Bump "* ]] || \

.github/workflows/binaries.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,48 @@ jobs:
343343
comment-tag: download-link
344344
mode: recreate
345345

346+
comment-on-issue:
347+
name: Comment on issue
348+
# separate job, because it should wait until all binaries are available
349+
needs: [conditions, build]
350+
if: ${{ (github.event_name == 'pull_request') && (needs.conditions.outputs.upload-to-builds-jabref-org == 'true') }}
351+
runs-on: ubuntu-latest
352+
steps:
353+
- name: echo PR data
354+
run: |
355+
echo "PR Number: ${{ github.event.pull_request.number }}"
356+
echo "PR URL: ${{ github.event.pull_request.html_url }}"
357+
cat <<EOF
358+
PR Body:
359+
${{ github.event.pull_request.body }}
360+
EOF
361+
- name: Determine issue number
362+
id: get_issue_number
363+
uses: koppor/ticket-check-action@add-output
364+
with:
365+
token: ${{ secrets.GITHUB_TOKEN }}
366+
ticketLink: 'https://github.com/JabRef/jabref/issues/%ticketNumber%'
367+
ticketPrefix: '#'
368+
titleRegex: '^#(?<ticketNumber>\d+)'
369+
branchRegex: '^(?<ticketNumber>\d+)'
370+
# Matches GitHub's closes/fixes/resolves #{number}, but does not match our example `Closes #13109` in PULL_REQUEST_TEMPLATE
371+
bodyRegex: '(?<action>fixes|closes|resolves)\s+(?:https?:\/\/github\.com\/JabRef\/jabref\/issues\/)?#?(?<ticketNumber>(?!13109\b)\d+)'
372+
bodyRegexFlags: 'i'
373+
outputOnly: true
374+
- name: Comment on issue
375+
if: ${{ steps.get_issue_number.outputs.ticketNumber != '-1' }}
376+
uses: thollander/actions-comment-pull-request@v3
377+
with:
378+
pr-number: ${{ steps.get_issue_number.outputs.ticketNumber }}
379+
message: >
380+
A pull request addressing the issue has been created.
381+
The build of this PR is available at <https://builds.jabref.org/pull/${{ github.event.pull_request.number }}/merge>.
382+
383+
384+
For any feedback, add a comment to the pull request at ${{ github.event.pull_request.html_url }}.
385+
comment-tag: download-link
386+
mode: recreate
387+
346388
notarize:
347389
# Outsourced in a separate job to be able to rerun if this fails for timeouts
348390
name: macOS notarization

.github/workflows/on-pr-opened-updated.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,11 @@ jobs:
162162
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
163163
remove_label:
164164
if: github.repository == 'JabRef/jabref'
165-
name: Remove label "status: changes-required"
165+
name: 'Remove label "status: changes-required"'
166166
runs-on: ubuntu-latest
167167
steps:
168-
- run: gh issue --repo ${{ github.repository }} edit ${{ github.event.pull_request.number }} --remove-label "status: changes-required"
168+
- run: |
169+
gh issue --repo ${{ github.repository }} edit ${{ github.event.pull_request.number }} --remove-label "status: changes-required"
169170
upload-pr-number:
170171
if: github.repository == 'JabRef/jabref'
171172
runs-on: ubuntu-latest

.github/workflows/tests-code-fetchers.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ env:
3232
SpringerNatureAPIKey: ${{ secrets.SPRINGERNATUREAPIKEY_FOR_TESTS }}
3333
AstrophysicsDataSystemAPIKey: ${{ secrets.AstrophysicsDataSystemAPIKey_FOR_TESTS }}
3434
IEEEAPIKey: ${{ secrets.IEEEAPIKey_FOR_TESTS }}
35-
BiodiversityHeritageApiKey: ${{ secrets.BiodiversityHeritageApiKey_FOR_TESTS}}
35+
BiodiversityHeritageApiKey: ${{ secrets.BiodiversityHeritageApiKey_FOR_TESTS }}
36+
MedlineApiKey: ${{ secrets.MedlineApiKey_FOR_TESTS }}
3637

3738
concurrency:
3839
group: "${{ github.workflow }}-${{ github.head_ref || github.ref }}"

.github/workflows/tests-code.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ env:
1414
BiodiversityHeritageApiKey: ${{ secrets.BiodiversityHeritageApiKey_FOR_TESTS}}
1515
IEEEAPIKey: ${{ secrets.IEEEAPIKey_FOR_TESTS }}
1616
SpringerNatureAPIKey: ${{ secrets.SPRINGERNATUREAPIKEY_FOR_TESTS }}
17+
MedlineAPiKey: ${{ secrets.MedlineApiKey_FOR_TESTS }}
1718
GRADLE_OPTS: -Xmx4g
1819
JAVA_OPTS: -Xmx4g
1920

@@ -113,6 +114,18 @@ jobs:
113114
run: |
114115
./gradlew --no-configuration-cache :rewriteDryRun
115116
117+
format:
118+
runs-on: ubuntu-latest
119+
steps:
120+
- uses: actions/checkout@v5
121+
- uses: koppor/intellij-idea-format@update-to-latest-intellij
122+
with:
123+
file-mask: "*.java"
124+
settings-file: "config/IntelliJ Code Style.xml"
125+
# job should fail in case there are changes
126+
- name: Check if any files changed
127+
run: git diff --exit-code
128+
116129
modernizer:
117130
name: Modernizer
118131
runs-on: ubuntu-latest

.gitignore

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,22 @@ gradle.properties
6868

6969

7070
# IntelliJ IDEA
71-
.idea/*
72-
!.idea/runConfigurations/
71+
.idea/workspace.xml
72+
.idea/checkstyleidea-libs
73+
74+
# only contains the reference name
75+
.idea/codeStyles/codeStyleConfig.xml
76+
77+
# references JDK_24 and the JDK name - high risk for conflicts
78+
.idea/misc.xml
79+
80+
# We don't modify these (and the defaults are good enough)
81+
.idea/.name
82+
.idea/IntelliLang.xml
83+
.idea/compiler.xml
84+
.idea/kotlinc.xml
85+
.idea/modules.xml
86+
7387
*.ipr
7488
*.iml
7589

.idea/.gitignore

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/checkstyle-idea.xml

Lines changed: 25 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)