Skip to content

Commit cd11463

Browse files
authored
Merge branch 'main' into fix-for-issue-JabRef#12272
2 parents cc78bbe + 1285ff2 commit cd11463

File tree

2 files changed

+33
-16
lines changed

2 files changed

+33
-16
lines changed

.github/ghprcomment.yml

+30-16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
- jobName: 'Source branch is other than "main"'
2+
message: >
3+
You committed your code on `main` brach. This is bad practise.
4+
5+
6+
Please start with a proper branch name.
7+
See [https://github.com/JabRef/jabref/blob/main/CONTRIBUTING.md#pull-request-process](CONTRIBUTING.md) for details.
8+
- jobName: windows installer and portable version
9+
message: >
10+
Your code does not compile.
11+
Please ensure your changes compile successfully before pushing changes.
12+
13+
14+
To verify compilation locally, run `./gradlew build` or try running JabRef.
15+
- jobName: 'Conflicts with target branch'
16+
message: >
17+
Your pull request conflicts with the target branch.
18+
19+
20+
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.
21+
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>.
122
- jobName: Checkstyle
223
message: >
324
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).
@@ -37,15 +58,6 @@
3758
message: |
3859
While the PR was in progress, a new version of JabRef has been released.
3960
You have to merge `upstream/main` and move your entry in `CHANGELOG.md` up to the section `## [Unreleased]`.
40-
- jobName: 'Unit tests'
41-
message: >
42-
JUnit tests are failing.
43-
In the area "Some checks were not successful", locate "Tests / Unit tests (pull_request)" and click on "Details".
44-
This brings you to the test output.
45-
46-
47-
You can then run these tests in IntelliJ to reproduce the failing tests locally.
48-
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.
4961
- jobName: no-force-push
5062
message: >
5163
Do not force-push!
@@ -84,16 +96,18 @@
8496
- ✅ `Fixes https://github.com/JabRef/jabref/issues/xyz` links pull-request to issue. Merging the PR will close the issue.
8597
- ✅ `Fixes https://github.com/Koppor/jabref/issues/xyz` links pull-request to issue. Merging the PR will close the issue.
8698
- ❌ `Fixes [#xyz](https://github.com/JabRef/jabref/issues/xyz)` links pull-request to issue. Merging the PR will **NOT** close the issue.
87-
- jobName: 'Conflicts with target branch'
88-
message: >
89-
Your pull request conflicts with the target branch.
90-
91-
92-
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.
93-
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>.
9499
- jobName: 'Submodules not modified'
95100
message: >
96101
Your pull request modified git submodules.
97102
98103
99104
Please follow our [FAQ on submodules](https://devdocs.jabref.org/code-howtos/faq.html#submodules) to fix.
105+
- jobName: 'Unit tests'
106+
message: >
107+
JUnit tests are failing.
108+
In the area "Some checks were not successful", locate "Tests / Unit tests (pull_request)" and click on "Details".
109+
This brings you to the test output.
110+
111+
112+
You can then run these tests in IntelliJ to reproduce the failing tests locally.
113+
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.

.github/workflows/tests.yml

+3
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,9 @@ jobs:
408408
sed -i "s/ all/ untracked/" .gitmodules
409409
410410
if ! git diff --submodule=log origin/${{ github.base_ref }} HEAD | grep -vzq "Submodule src"; then
411+
echo "Debug:"
412+
echo git diff --submodule=log origin/${{ github.base_ref }} HEAD
413+
git diff --submodule=log origin/${{ github.base_ref }} HEAD
411414
echo "❌ Submodule modifications detected"
412415
exit 1
413416
fi

0 commit comments

Comments
 (0)