Skip to content

Commit 18d0a07

Browse files
authored
Merge branch 'main' into fix-unresponsive-consistency-check
2 parents 795ebe1 + 1c42777 commit 18d0a07

File tree

602 files changed

+66217
-7893
lines changed

Some content is hidden

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

602 files changed

+66217
-7893
lines changed

.devcontainer/devcontainer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@
3131
// Install java.
3232
// See https://github.com/devcontainers/features/tree/main/src/java#options for details.
3333
"ghcr.io/devcontainers/features/java:1": {
34-
"version": "24.0.1-amzn",
35-
"installGradle": false,
34+
"version": "24.0.2-amzn",
35+
"installGradle": true,
36+
"gradleVersion": "8.14.3",
3637
"jdkDistro": "Corretto"
3738
}
3839
}

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ 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

@@ -25,9 +25,8 @@ Keep ALL the items. Replace the dots inside [.] and mark them as follows:
2525
-->
2626

2727
- [x] I own the copyright of the code submitted and I license it under the [MIT license](https://github.com/JabRef/jabref/blob/main/LICENSE)
28-
- [.] Change in `CHANGELOG.md` described in a way that is understandable for the average user (if change is visible to the user)
29-
- [.] Tests created for changes (if applicable)
30-
- [.] Manually tested changed features in running JabRef (always required)
31-
- [.] Screenshots added in PR description (if change is visible to the user)
32-
- [.] [Checked developer's documentation](https://devdocs.jabref.org/): Is the information available and up to date? If not, I outlined it in this pull request.
33-
- [.] [Checked documentation](https://docs.jabref.org/): Is the information available and up to date? If not, I created an issue at <https://github.com/JabRef/user-documentation/issues> or, even better, I submitted a pull request to the documentation repository.
28+
- [.] I manually tested my changes in running JabRef (always required)
29+
- [.] I added JUnit tests for changes (if applicable)
30+
- [.] I added screenshots in the PR description (if change is visible to the user)
31+
- [.] I described the change in `CHANGELOG.md` in a way that is understandable for the average user (if change is visible to the user)
32+
- [.] I checked the [user documentation](https://docs.jabref.org/): Is the information available and up to date? If not, I created an issue at <https://github.com/JabRef/user-documentation/issues> or, even better, I submitted a pull request updating file(s) in <https://github.com/JabRef/user-documentation/tree/main/en>.

.github/ghprcomment.yml

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
message: >
1515
JUnit tests of `jablib` are failing.
1616
You can see which checks are failing by locating the box "Some checks were not successful" on the pull request page.
17-
To see the test output, locate "Tests / Unit tests (pull_request)" and click on it.
17+
To see the test output, locate "Source Code Tests / Unit tests (pull_request)" and click on it.
1818
1919
2020
You can then run these tests in IntelliJ to reproduce the failing tests locally.
@@ -24,7 +24,7 @@
2424
message: >
2525
JUnit tests of `jabkit` are failing.
2626
You can see which checks are failing by locating the box "Some checks were not successful" on the pull request page.
27-
To see the test output, locate "Tests / Unit tests (pull_request)" and click on it.
27+
To see the test output, locate "Source Code Tests / Unit tests (pull_request)" and click on it.
2828
2929
3030
You can then run these tests in IntelliJ to reproduce the failing tests locally.
@@ -34,7 +34,7 @@
3434
message: >
3535
JUnit tests of `jabsrv` are failing.
3636
You can see which checks are failing by locating the box "Some checks were not successful" on the pull request page.
37-
To see the test output, locate "Tests / Unit tests (pull_request)" and click on it.
37+
To see the test output, locate "Source Code Tests / Unit tests (pull_request)" and click on it.
3838
3939
4040
You can then run these tests in IntelliJ to reproduce the failing tests locally.
@@ -45,7 +45,7 @@
4545
Your code currently does not meet [JabRef's code guidelines](https://devdocs.jabref.org/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-13-code-style.html).
4646
We use [Checkstyle](https://checkstyle.sourceforge.io/) to identify issues.
4747
You can see which checks are failing by locating the box "Some checks were not successful" on the pull request page.
48-
To see the test output, locate "Tests / Checkstyle (pull_request)" and click on it.
48+
To see the test output, locate "Source Code Tests / Checkstyle (pull_request)" and click on it.
4949
5050
5151
In case of issues with the import order, double check that you [activated Auto Import](https://devdocs.jabref.org/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-13-code-style.html#enable-proper-import-cleanup).
@@ -60,7 +60,7 @@
6060
Your code currently does not meet JabRef's code guidelines.
6161
We use [OpenRewrite](https://docs.openrewrite.org/) to ensure "modern" Java coding practices.
6262
You can see which checks are failing by locating the box "Some checks were not successful" on the pull request page.
63-
To see the test output, locate "Tests / OpenRewrite (pull_request)" and click on it.
63+
To see the test output, locate "Source Code Tests / OpenRewrite (pull_request)" and click on it.
6464
6565
6666
The issues found can be **automatically fixed**.
@@ -71,7 +71,7 @@
7171
Your code currently does not meet JabRef's code guidelines.
7272
We use [Gradle Modernizer Plugin](https://github.com/andygoossens/gradle-modernizer-plugin#gradle-modernizer-plugin) to ensure "modern" Java coding practices.
7373
You can see which checks are failing by locating the box "Some checks were not successful" on the pull request page.
74-
To see the test output, locate "Tests / Modernizer (pull_request)" and click on it.
74+
To see the test output, locate "Source Code Tests / Modernizer (pull_request)" and click on it.
7575
7676
7777
Please fix the detected errors, commit, and push.
@@ -130,7 +130,10 @@
130130
Hey, we noticed that you **force-pushed** your changes.
131131
Force pushing is a bad practice when working together on a project (mainly because it is [not supported well by GitHub itself](https://github.com/orgs/community/discussions/3478)).
132132
Commits are lost and comments on commits lose their context, thus making it harder to review changes.
133-
At the end, all commits will be [squashed](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges#squash-and-merge-your-commits) anyway before being merged into the `main` branch.
133+
134+
135+
When the pull request is getting integrated into `main`, all commits will be [squashed](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges#squash-and-merge-your-commits) anyway.
136+
Thus, your individual commit history will not be visible in `main`.
134137
135138
136139
In future, **please avoid that**. For now, you can continue working.
@@ -165,25 +168,25 @@
165168
166169
Give it a read, and you’ll discover the ancient wisdom of assigning issues to yourself. Trust me, it’s worth it. 🚀
167170
168-
- jobName: 'PR title must not start with "Fix for issue <number>"'
169-
workflowName: 'PR Tests'
171+
- jobName: 'PR title must not contain "issue <number>"'
172+
workflowName: 'PR Format'
170173
always: true
171174
message: >
172175
The title of the pull request must not start with "Fix for issue xyz".
173176
Please use a concise one-line summary that explains what the fix or change actually does.
174177
Example of a good title: "Prevent crash when importing malformed BibTeX entries".
175178
- jobName: 'Mandatory Checks present'
176-
workflowName: 'PR Tests'
179+
workflowName: 'PR Format'
177180
always: true
178181
message: >
179182
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).
180183
- jobName: 'PR checklist OK'
181-
workflowName: 'PR Tests'
184+
workflowName: 'PR Format'
182185
always: true
183186
message: >
184187
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).
185188
- jobName: 'Determine issue number'
186-
workflowName: 'PR Tests'
189+
workflowName: 'On PR opened/updated'
187190
always: true
188191
message: |
189192
Your pull request needs to link an issue correctly.

.github/workflows/binaries.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ jobs:
174174
name: ${{ matrix.displayName }} installer and portable version
175175
steps:
176176
- name: Fetch all history for all tags and branches
177-
uses: actions/checkout@v4
177+
uses: actions/checkout@v5
178178
with:
179179
fetch-depth: 0
180180
submodules: 'true'
@@ -193,11 +193,11 @@ jobs:
193193
id: gitversion
194194
uses: gittools/actions/gitversion/execute@v3.2.1
195195
- name: Setup JDK
196-
uses: actions/setup-java@v4
196+
uses: actions/setup-java@v5
197197
with:
198198
java-version: '24'
199199
distribution: 'corretto'
200-
java-package: 'jdk'
200+
check-latest: true
201201
- name: Setup Gradle
202202
uses: gradle/actions/setup-gradle@v4
203203
- name: Generate JBang cache key
@@ -362,7 +362,7 @@ jobs:
362362
runs-on: ${{ matrix.os }}
363363
steps:
364364
- name: Download from GitHub workflow artifacts store (macOS)
365-
uses: actions/download-artifact@v4
365+
uses: actions/download-artifact@v5
366366
with:
367367
name: JabRef-${{ matrix.os }}-tbn
368368
- name: Notarize dmg

.github/workflows/check-links.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
if: github.repository == 'JabRef/jabref'
2121
runs-on: ubuntu-latest
2222
steps:
23-
- uses: actions/checkout@v4
23+
- uses: actions/checkout@v5
2424
with:
2525
show-progress: 'false'
2626
- name: Run linkspector

.github/workflows/cleanup-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
with:
2323
ignore_sha: true
2424
workflow_id: 160969125
25-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v5
2626
- name: "Check for 'dev: binaries' label"
2727
id: check_label
2828
run: |

.github/workflows/dockerimages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- name: Set up Docker Buildx
5454
uses: docker/setup-buildx-action@v3
5555
- name: Fetch all history for all tags and branches
56-
uses: actions/checkout@v4
56+
uses: actions/checkout@v5
5757
with:
5858
fetch-depth: 0
5959
submodules: 'true'

.github/workflows/gource.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151

5252
steps:
5353
- name: Checkout
54-
uses: actions/checkout@v4
54+
uses: actions/checkout@v5
5555
with:
5656
fetch-depth: 0
5757
show-progress: 'false'

.github/workflows/latex.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
runs-on: ubuntu-latest
2828
steps:
2929
- name: Check out code
30-
uses: actions/checkout@v4
30+
uses: actions/checkout@v5
3131
- name: Install TeX Live
3232
uses: zauguin/install-texlive@v4
3333
with:
@@ -80,7 +80,7 @@ jobs:
8080
bibengine: biber
8181
steps:
8282
- name: Check out code
83-
uses: actions/checkout@v4
83+
uses: actions/checkout@v5
8484

8585
- name: Install TeX Live
8686
uses: zauguin/install-texlive@v4

.github/workflows/on-issue-comment.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ jobs:
1717
uses: takanome-dev/assign-issue-action@edge
1818
with:
1919
github_token: '${{ secrets.GITHUB_TOKEN }}'
20-
days_until_unassign: 14
20+
# If this is updated, also update the number at unassign-issues.yml
21+
days_until_unassign: 21
2122
maintainers: 'koppor,Siedlerchr,ThiloteE,calixtus,HoussemNasri,subhramit,InAnYan,LinusDietz'
2223
assigned_comment: |
2324
👋 Hey @{{ handle }}, thank you for your interest in this issue! 🎉
@@ -32,9 +33,10 @@ jobs:
3233
3334
Happy coding! 🚀
3435
assignment_suggestion_comment: >
35-
👋 Hey @{{ handle }}, looks like you’re eager to work on this issue—great! 🎉
36-
It also 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.
37-
Give it a read, and you’ll discover the ancient wisdom of assigning issues to yourself. Trust me, it’s worth it. 🚀
36+
👋 Hey @{{ handle }}, looks like you’re eager to work on this issue — great! 🎉
37+
It also looks like you don't know how to assign issues to yourself.
38+
Please read our [CONTRIBUTING.md](https://github.com/JabRef/jabref/blob/main/CONTRIBUTING.md) to find out how.
39+
It will also guide you in other aspects of contributing to JabRef.
3840
- name: Move issue corresponding column in "Candidates for University Projects"
3941
uses: m7kvqbe1/github-action-move-issues@main
4042
if: ${{ steps.assign.outputs.assigned == 'yes' || steps.assign.outputs.unassigned == 'yes' }}

0 commit comments

Comments
 (0)