Skip to content

Commit 14489b3

Browse files
committed
Merge branch 'main' into fork/Kaan0029/gsoc-ocr-tess4j-initial-implementation
# Conflicts: # jablib/build.gradle.kts
2 parents f80cec8 + 9f6be7f commit 14489b3

File tree

240 files changed

+5176
-3876
lines changed

Some content is hidden

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

240 files changed

+5176
-3876
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
Closes #_____
1+
Closes _____
2+
<!-- LINK THE ISSUE WITH THE "Closes" KEYWORD. Example: Closes https://github.com/JabRef/jabref/issues/13109 OR Closes #13109 -->
23

3-
In about one to three sentences, describe the changes you have made: what, where, why, ...
4+
<!-- In about one to three sentences, describe the changes you have made: what, where, why, ... (REPLACE THIS LINE) -->
45

56
<!-- NOTE: If your work is not yet complete, please open a draft pull request. In that case, outline your intended next steps. Do you need feedback? Will you continue in parallel? ... -->
67

78
### Steps to test
89

9-
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-
You can add screenshots or videos (using [Loom](https://www.loom.com/) or by just adding .mp4 files).
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. -->
11+
<!-- You can add screenshots or videos (using Loom - https://www.loom.com or by just adding .mp4 files). -->
12+
<!-- (REPLACE THIS PARAGRAPH) -->
1113

1214
<!-- YOU HAVE TO MODIFY THE ABOVE TEXT FIT YOUR PR. OTHERWISE, YOUR PR WILL BE CLOSED WITHOUT FURTHER COMMENT. -->
13-
<!-- LINK THE ISSUE WITH THE "Closes" KEYWORD. Example: Closes (link) OR Closes #12345 -->
1415

1516
### Mandatory checks
1617

.github/dependabot.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,8 @@ version: 2
22
updates:
33
- package-ecosystem: gradle
44
directories:
5-
- "/build-logic" # Build-related logic for gradle
6-
- "/jabgui" # JabRef's GUI
7-
- "/jabkit" # JabRef's CLI ("JabKit")
8-
- "/jablib" # Core library
9-
- "/jabsrv" # Server-related module
10-
- "/jabsrv-cli" # CLI for the server
11-
- "/test-support" # Module for test utilities
5+
- "/build-logic" # versions of 3rd party gradle plugins
6+
- "/versions" # versions of 3rd party dependencies of all JabRef modules
127
schedule:
138
interval: weekly
149
labels:

.github/ghprcomment.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,20 @@
7979
If you made changes that are visible to the user, please add a brief description along with the issue number to the `CHANGELOG.md` file.
8080
If you did not, please replace the cross (`[x]`) by a slash (`[/]`) to indicate that no `CHANGELOG.md` entry is necessary.
8181
More details can be found in our [Developer Documentation about the changelog](https://devdocs.jabref.org/decisions/0007-human-readable-changelog.html).
82-
- jobName: CHANGELOG.md
82+
- jobName: 'CHANGELOG.md - only unreleased touched'
8383
message: >
8484
While the PR was in progress, a new version of JabRef has been released.
8585
8686
8787
You have to merge `upstream/main` and move your entry in `CHANGELOG.md` up to the section `## [Unreleased]`.
88+
- jobName: CHANGELOG.md
89+
message: >
90+
You modified `CHANGELOG.md` and did not meet JabRef's rules for consistently formatted Markdown files.
91+
To ensure consistent styling, we have [markdown-lint](https://github.com/DavidAnson/markdownlint) in place.
92+
[Markdown lint's rules](https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#rules) help to keep our Markdown files consistent within this repository and consistent with the Markdown files outside here.
93+
94+
95+
You can check the detailed error output by navigating to your pull request, selecting the tab "Checks", section "Tests" (on the left), subsection "CHANGELOG.md".
8896
- jobName: Markdown
8997
message: >
9098
You modified Markdown (`*.md`) files and did not meet JabRef's rules for consistently formatted Markdown files.

.github/workflows/automerge.yml

Lines changed: 44 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,57 @@ permissions:
88
jobs:
99
automerge:
1010
runs-on: ubuntu-latest
11-
# Run only if PR is inside JabRef's main repository and created by dependabot or by an update workflow
12-
if: >
13-
(github.repository == 'JabRef/jabref') &&
14-
(
15-
(github.actor == 'renovate-bot' && startsWith(github.event.pull_request.title, 'chore(deps):')) ||
16-
(
17-
(github.event.pull_request.head.repo.full_name == 'JabRef/jabref') &&
18-
(
19-
(github.actor == 'dependabot[bot]') ||
20-
(
21-
startsWith(github.event.pull_request.title, '[Bot] ') ||
22-
startsWith(github.event.pull_request.title, 'Bump ') ||
23-
startsWith(github.event.pull_request.title, 'New Crowdin updates') ||
24-
startsWith(github.event.pull_request.title, 'Update Gradle Wrapper from')
25-
)
26-
)
27-
)
28-
)
11+
if: github.repository == 'JabRef/jabref'
2912
steps:
13+
- name: Determine if job should run
14+
id: shouldrun
15+
shell: bash
16+
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+
26+
head_repo="${{ github.event.pull_request.head.repo.full_name }}"
27+
if [[ "$head_repo" != "JabRef/jabref" ]]; then
28+
echo "🚫 not from JabRef/jabref"
29+
echo "shouldrun=false" >> "$GITHUB_OUTPUT"
30+
exit 0
31+
fi
32+
33+
if [[ "$actor" == "dependabot[bot]" ]] || \
34+
[[ "$title" == "[Bot] "* ]] || \
35+
[[ "$title" == "Bump "* ]] || \
36+
[[ "$title" == "New Crowdin updates"* ]] || \
37+
[[ "$title" == "Update Gradle Wrapper from"* ]]; then
38+
echo "✅ title OK"
39+
echo "shouldrun=true" >> "$GITHUB_OUTPUT"
40+
exit 0
41+
fi
42+
43+
LABELS=$(gh api repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/labels --jq '.[].name')
44+
if echo "$LABELS" | grep -q "^automerge"; then
45+
echo "✅ label automerge"
46+
echo "shouldrun=true" >> "$GITHUB_OUTPUT"
47+
exit 0
48+
fi
49+
50+
echo "🚫 no automerge"
51+
echo "shouldrun=false" >> "$GITHUB_OUTPUT"
52+
env:
53+
GH_TOKEN: ${{secrets.GH_TOKEN_JABREF_MACHINE_PR_APPROVE}}
3054
- name: Approve PR
55+
if: steps.shouldrun.outputs.shouldrun == 'true'
3156
run: gh pr review --approve "$PR_URL"
3257
env:
3358
PR_URL: ${{github.event.pull_request.html_url}}
3459
GH_TOKEN: ${{secrets.GH_TOKEN_JABREF_MACHINE_PR_APPROVE}}
3560
- name: Merge PR
61+
if: steps.shouldrun.outputs.shouldrun == 'true'
3662
run: gh pr merge --auto --squash "$PR_URL"
3763
env:
3864
PR_URL: ${{github.event.pull_request.html_url}}

0 commit comments

Comments
 (0)