Skip to content

Commit 2e97999

Browse files
authored
Merge branch 'main' into support-escaped-spaces
2 parents 6be2b1b + c215a39 commit 2e97999

File tree

1,332 files changed

+68712
-17208
lines changed

Some content is hidden

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

1,332 files changed

+68712
-17208
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/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ body:
1414
label: JabRef version
1515
options:
1616
- "5.15 (latest release)"
17-
- "6.0-alpha2"
17+
- "6.0-alpha.3"
1818
- Latest development branch build (please note build date below)
1919
- Other (please describe below)
2020
description: The version as shown in the about dialog.
@@ -43,7 +43,7 @@ body:
4343

4444
- type: checkboxes
4545
attributes:
46-
label: Checked with the latest development build (copy version output from About dialog)
46+
label: Checked with the [latest development build](https://builds.jabref.org/main/) (copy version output from About dialog)
4747
description: |
4848
Please always test if the bug is still reproducible in the latest development version. We are constantly improving JabRef and some bugs may already be fixed. If you already use a development version, ensure that you use the latest one.
4949
You can download the latest development build at: https://builds.jabref.org/main/ . **Please make a backup of your library before you try out this version.**

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ Closes _____
77

88
### Steps to test
99

10-
<!-- Describe how reviewers can test this fix/feature. Ideally, think of how you would guide a beginner user of Jabef to try out your change. -->
10+
<!-- Describe how reviewers can test this fix/feature. Ideally, think of how you would guide a beginner user of JabRef to try out your change. -->
1111
<!-- You can add screenshots or videos (using Loom - https://www.loom.com or by just adding .mp4 files). -->
1212
<!-- (REPLACE THIS PARAGRAPH) -->
1313

14-
<!-- YOU HAVE TO MODIFY THE ABOVE TEXT FIT YOUR PR. OTHERWISE, YOUR PR WILL BE CLOSED WITHOUT FURTHER COMMENT. -->
14+
<!-- YOU HAVE TO MODIFY THE ABOVE TEXT TO FIT YOUR PR. OTHERWISE, YOUR PR WILL BE CLOSED WITHOUT FURTHER COMMENT. -->
1515

1616
### Mandatory checks
1717

.github/dependabot.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ updates:
33
- package-ecosystem: gradle
44
directories:
55
- "/build-logic" # versions of 3rd party gradle plugins
6+
- "jablib"
67
- "/versions" # versions of 3rd party dependencies of all JabRef modules
78
- "/" # plugins
89
schedule:
910
interval: weekly
10-
labels:
11-
- "dependencies"
11+
day: sunday
12+
labels: [ ]
1213
ignore:
1314
- dependency-name: com.microsoft.azure:applicationinsights-core
1415
versions:
@@ -20,9 +21,18 @@ updates:
2021
directory: "/"
2122
schedule:
2223
interval: weekly
23-
labels:
24-
- "dependencies"
24+
day: sunday
25+
labels: [ ]
2526
- package-ecosystem: "gitsubmodule"
2627
directory: "/"
2728
schedule:
2829
interval: weekly
30+
day: sunday
31+
labels: [ ]
32+
- package-ecosystem: "maven"
33+
directories:
34+
- "jablib-examples/maven3/doi-to-bibtex"
35+
schedule:
36+
interval: weekly
37+
day: sunday
38+
labels: [ ]

.github/ghprcomment.yml

Lines changed: 22 additions & 16 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: >
@@ -78,8 +88,8 @@
7888
7989
# CHANGELOG.md and *.md
8090

81-
- jobName: 'CHANGELOG.md needs to be modified'
82-
workflowName: 'PR Tests'
91+
- jobName: 'CHANGELOG.md needs to be modified if indicated'
92+
workflowName: 'Check PR CHANGELOG.md'
8393
message: >
8494
You ticked that you modified `CHANGELOG.md`, but no new entry was found there.
8595
@@ -117,14 +127,14 @@
117127
# Submodules and branches
118128

119129
- jobName: 'Submodules not modified'
120-
workflowName: 'PR Tests'
130+
workflowName: 'Check PR Modifications'
121131
message: >
122132
Your pull request modified git submodules.
123133
124134
125135
Please follow our [FAQ on submodules](https://devdocs.jabref.org/code-howtos/faq.html#submodules) to fix.
126136
- jobName: no-force-push
127-
workflowName: 'PR Tests'
137+
workflowName: 'Check PR Modifications'
128138
always: true
129139
message: >
130140
Hey, we noticed that you **force-pushed** your changes.
@@ -146,7 +156,7 @@
146156
Please [merge `upstream/main`](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork#syncing-a-fork-branch-from-the-command-line) with your code.
147157
For a step-by-step guide to resolve merge conflicts, see <https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line>.
148158
- jobName: 'Source branch is other than "main"'
149-
workflowName: 'PR Tests'
159+
workflowName: 'Check PR Modifications'
150160
message: >
151161
You committed your code on the `main` brach of your fork. This is a bad practice.
152162
The right way is to branch out from `main`, work on your patch/feature in that new branch, and then get that branch merged via the pull request (see [GitHub flow](https://docs.github.com/en/get-started/using-github/github-flow)).
@@ -160,42 +170,38 @@
160170
# PR hygiene
161171

162172
- jobName: 'Ensure that contributor is assigned (fails if not commented on issue)'
163-
workflowName: 'On PR opened/updated'
173+
workflowName: 'Link PR to Issue'
164174
message: >
165175
You did not assign yourself to the issue.
166176
Thus, it looks like you skipped reading our [CONTRIBUTING.md](https://github.com/JabRef/jabref/blob/main/CONTRIBUTING.md), which explains exactly how to participate. No worries, it happens to the best of us.
167177
168178
169179
Give it a read, and you’ll discover the ancient wisdom of assigning issues to yourself. Trust me, it’s worth it. 🚀
170180
171-
- jobName: 'PR title must not start with "Fix for issue <number>"'
172-
workflowName: 'PR Tests'
181+
- jobName: 'PR title must not contain "issue <number>"'
182+
workflowName: 'Check PR Format'
173183
always: true
174184
message: >
175185
The title of the pull request must not start with "Fix for issue xyz".
176186
Please use a concise one-line summary that explains what the fix or change actually does.
177187
Example of a good title: "Prevent crash when importing malformed BibTeX entries".
178188
- jobName: 'Mandatory Checks present'
179-
workflowName: 'PR Tests'
189+
workflowName: 'Check PR Format'
180190
always: true
181191
message: >
182192
You have removed the "Mandatory Checks" section from your pull request description. Please adhere to our [pull request template](https://github.com/JabRef/jabref/blob/main/.github/PULL_REQUEST_TEMPLATE.md?plain=1#L10).
183193
- jobName: 'PR checklist OK'
184-
workflowName: 'PR Tests'
194+
workflowName: 'Check PR Format'
185195
always: true
186196
message: >
187197
Note that your PR will not be reviewed/accepted until you have gone through the mandatory checks in the description and marked each of them them exactly in the format of `[x]` (done), `[ ]` (not done yet) or `[/]` (not applicable).
188198
- jobName: 'Determine issue number'
189-
workflowName: 'PR Tests'
199+
workflowName: 'Link PR to Issue'
190200
always: true
191201
message: |
192202
Your pull request needs to link an issue correctly.
193203
194-
To ease organizational workflows, please link this pull-request to the issue with syntax as described in <https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue>:
195-
196-
> <h2 id="linking-a-pull-request-to-an-issue-using-a-keyword">Linking a pull request to an issue using a keyword</h2>
197-
> <p>You can link a pull request to an issue by using a supported keyword
198-
> in the pull request's description or in a commit message.
204+
To ease organizational workflows, please link this pull request to the issue by including a supported keyword in the pull request's description as per syntax described in [GitHub's documentation](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
199205
200206
### Examples
201207

.github/workflows/automerge.yml

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,41 @@ jobs:
99
automerge:
1010
runs-on: ubuntu-latest
1111
if: github.repository == 'JabRef/jabref'
12+
env:
13+
HEAD_REPO: ${{ github.event.pull_request.head.repo.full_name }}
14+
USER: ${{ github.event.pull_request.user.login }}
15+
TITLE: ${{ github.event.pull_request.title }}
1216
steps:
1317
- name: Determine if job should run
1418
id: shouldrun
1519
shell: bash
1620
run: |
17-
actor='${{ github.actor }}'
18-
title='${{ github.event.pull_request.title }}'
21+
echo USER: $USER
1922
20-
if [[ "$actor" == "renovate-bot" ]]; then
23+
if [[ "$USER" == "renovate-bot" ]]; then
2124
echo "✅ from renote-bot"
2225
echo "shouldrun=true" >> "$GITHUB_OUTPUT"
2326
exit 0
2427
fi
2528
26-
head_repo="${{ github.event.pull_request.head.repo.full_name }}"
27-
if [[ "$head_repo" != "JabRef/jabref" ]]; then
29+
if [[ "$USER" == "dependabot[bot]" ]]; then
30+
echo "✅ from dependabot"
31+
echo "shouldrun=true" >> "$GITHUB_OUTPUT"
32+
exit 0
33+
fi
34+
35+
if [[ "$HEAD_REPO" != "JabRef/jabref" ]]; then
2836
echo "🚫 not from JabRef/jabref"
2937
echo "shouldrun=false" >> "$GITHUB_OUTPUT"
3038
exit 0
3139
fi
3240
33-
if [[ "$actor" == "dependabot[bot]" ]] || \
34-
[[ "$title" == "[Bot] "* ]] || \
35-
[[ "$title" == "Bump "* ]] || \
36-
[[ "$title" == "New Crowdin updates"* ]] || \
37-
[[ "$title" == "Update Gradle Wrapper from"* ]]; then
41+
if [[ "$USER" == "dependabot[bot]" ]] || \
42+
[[ "$TITLE" == "Chore(deps): "* ]] || \
43+
[[ "$TITLE" == "[Bot] "* ]] || \
44+
[[ "$TITLE" == "Bump "* ]] || \
45+
[[ "$TITLE" == "New Crowdin updates"* ]] || \
46+
[[ "$TITLE" == "Update Gradle Wrapper from"* ]]; then
3847
echo "✅ title OK"
3948
echo "shouldrun=true" >> "$GITHUB_OUTPUT"
4049
exit 0

0 commit comments

Comments
 (0)