Skip to content

Commit 646b657

Browse files
committed
chore: merge upstream/main and resolve conflicts
2 parents 50c3549 + 4ff598a commit 646b657

File tree

3,246 files changed

+6411
-7723
lines changed

Some content is hidden

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

3,246 files changed

+6411
-7723
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
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": "23.0.1-tem",
34+
"version": "24.0.1-tem",
3535
"installGradle": false,
3636
"jdkDistro": "Temurin"
3737
}

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ body:
1313
label: JabRef version
1414
options:
1515
- "5.15 (latest release)"
16-
- "6.0-alpha"
16+
- "6.0-alpha2"
1717
- Latest development branch build (please note build date below)
1818
- Other (please describe below)
1919
description: The version as shown in the about dialog.

.github/dependabot.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@ updates:
1313
- dependency-name: com.microsoft.azure:applicationinsights-logging-log4j2
1414
versions:
1515
- ">= 2.5.a" # Blocked by https://github.com/microsoft/ApplicationInsights-Java/issues/1155
16-
- package-ecosystem: gradle
17-
directory: "buildSrc/"
18-
schedule:
19-
interval: weekly
20-
labels:
21-
- "dependencies"
2216
- package-ecosystem: "github-actions"
2317
directory: "/"
2418
schedule:

.github/ghprcomment.yml

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,27 @@
88
99
To verify compilation locally, run `./gradlew build` or try running JabRef.
1010
11-
- jobName: 'Unit tests'
11+
- jobName: 'Unit tests - jablib'
1212
message: >
13-
JUnit tests are failing.
13+
JUnit tests of `jablib` are failing.
14+
You can see which checks are failing by locating the box "Some checks were not successful" on the pull request page.
15+
To see the test output, locate "Tests / Unit tests (pull_request)" and click on it.
16+
17+
18+
You can then run these tests in IntelliJ to reproduce the failing tests locally.
19+
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.
20+
- jobName: 'Unit tests - jabkit'
21+
message: >
22+
JUnit tests of `jabkit` are failing.
23+
You can see which checks are failing by locating the box "Some checks were not successful" on the pull request page.
24+
To see the test output, locate "Tests / Unit tests (pull_request)" and click on it.
25+
26+
27+
You can then run these tests in IntelliJ to reproduce the failing tests locally.
28+
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.
29+
- jobName: 'Unit tests - jabsrv'
30+
message: >
31+
JUnit tests of `jabsrv` are failing.
1432
You can see which checks are failing by locating the box "Some checks were not successful" on the pull request page.
1533
To see the test output, locate "Tests / Unit tests (pull_request)" and click on it.
1634
@@ -38,7 +56,7 @@
3856
You can see which checks are failing by locating the box "Some checks were not successful" on the pull request page.
3957
To see the test output, locate "Tests / OpenRewrite (pull_request)" and click on it.
4058
41-
59+
4260
The issues found can be **automatically fixed**.
4361
Please execute the gradle task *`rewriteRun`* from the [`rewrite` group of the Gradle Tool window](https://devdocs.jabref.org/code-howtos/faq.html#failing-openrewrite-tests) in IntelliJ, then check the results, commit, and push.
4462
- jobName: Modernizer

.github/workflows/automerge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
(
1818
startsWith(github.event.pull_request.title, '[Bot] ') ||
1919
startsWith(github.event.pull_request.title, 'Bump ') ||
20-
startsWith(github.event.pull_request.title, 'New Crowdin updates') ||
20+
startsWith(github.event.pull_request.title, 'New Crowdin Translations') ||
2121
startsWith(github.event.pull_request.title, 'Update Gradle Wrapper from')
2222
)
2323
)

.github/workflows/crowdin.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Crowdin Action
2+
3+
on:
4+
push:
5+
branches:
6+
- use-crowdin-action
7+
schedule:
8+
# run on each Wednesday
9+
- cron: '2 3 * * 3'
10+
workflow_dispatch:
11+
12+
jobs:
13+
synchronize-with-crowdin:
14+
if: github.repository == 'JabRef/jabref'
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v4
20+
21+
- name: crowdin action
22+
uses: crowdin/github-action@v2
23+
with:
24+
upload_sources: true
25+
upload_translations: false
26+
upload_language: de
27+
download_translations: true
28+
localization_branch_name: l10n_crowdin_translations
29+
create_pull_request: true
30+
pull_request_title: 'New Crowdin Translations'
31+
pull_request_body: 'New Crowdin translations by [Crowdin GH Action](https://github.com/crowdin/github-action)'
32+
pull_request_base_branch_name: 'main'
33+
env:
34+
GITHUB_TOKEN: ${{ secrets.GH_TOKEN_JABREF_MACHINE_PR_APPROVE }}
35+
36+
# A numeric ID, found at https://crowdin.com/project/<projectName>/tools/api
37+
CROWDIN_PROJECT_ID: 294858
38+
39+
# Visit https://crowdin.com/settings#api-key to create this token
40+
CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

.github/workflows/deployment-arm64.yml

Lines changed: 0 additions & 270 deletions
This file was deleted.

0 commit comments

Comments
 (0)