Skip to content

Commit 1807fc8

Browse files
committed
Merge remote-tracking branch 'upstream/main'
* upstream/main: Refine .gitginore (#13931) Hotfix: Markdown lint issue Update custom code style decision document Chore(deps): Bump org.openrewrite.rewrite from 7.15.0 to 7.16.0 (#13923) New translations jabref_en.properties (French) (#13928) Chore(deps): Bump com.fasterxml.jackson.dataformat:jackson-dataformat-yaml (#13927) Chore(deps): Bump com.autonomousapps:dependency-analysis-gradle-plugin (#13924) Chore(deps): Bump com.autonomousapps:dependency-analysis-gradle-plugin (#13921) Chore(deps): Bump org.yaml:snakeyaml from 2.4 to 2.5 in /versions (#13922) Chore(deps): Bump tj-actions/changed-files from 45 to 47 (#13917) Chore(deps): Bump plbstl/first-contribution from 3 to 4 (#13916) Share .idea/codeStyles/Project.xml (#13913) Chore(deps): Bump actions/github-script from 7 to 8 (#13915) Chore(deps): Bump jbangdev/jbang-action from 0.129.0 to 0.130.0 (#13914)
2 parents afe0c50 + 058e9ed commit 1807fc8

File tree

19 files changed

+353
-370
lines changed

19 files changed

+353
-370
lines changed

.github/workflows/cleanup-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- name: Get changed docker files
4747
# in line with dockerimages.yml -> lines 6 and 7
4848
id: changed-docker-files
49-
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46
49+
uses: tj-actions/changed-files@24d32ffd492484c1d75e0c0b894501ddb9d30d62 # v46
5050
with:
5151
# Avoid using single or double quotes for multiline patterns
5252
files: |

.github/workflows/on-pr-opened.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
issues: write
1313
pull-requests: write
1414
steps:
15-
- uses: plbstl/first-contribution@v3
15+
- uses: plbstl/first-contribution@v4
1616
with:
1717
labels: first contrib
1818
pr-opened-msg: |

.github/workflows/pr-comment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
# This step runs in both cases using the proper variables.
9191
- name: ghprcomment@main
9292
if: ${{ github.event_name == 'workflow_dispatch' || (steps.check-label.outputs.has_label == 'false' && steps.read-pr_number.outputs.pr_number != '' && steps.isCrossRepository.outputs.isCrossRepository == 'true') }}
93-
uses: jbangdev/jbang-action@v0.129.0
93+
uses: jbangdev/jbang-action@v0.130.0
9494
with:
9595
script: https://github.com/koppor/ghprcomment/blob/main/ghprcomment.java
9696
scriptargs: "-r JabRef/jabref -p ${{ steps.set-vars.outputs.pr_number }} -w ${{ steps.set-vars.outputs.workflow_run_id }}"

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
fetch-depth: 0
5858
- name: Detect changed jablib classes or workflow
5959
id: changed
60-
uses: tj-actions/changed-files@v45
60+
uses: tj-actions/changed-files@v47
6161
with:
6262
files: |
6363
jablib/src/main/java/**/*.java

.github/workflows/tests-code.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ jobs:
121121
- uses: koppor/intellij-idea-format@update-to-latest-intellij
122122
with:
123123
file-mask: "*.java"
124-
settings-file: "config/IntelliJ Code Style.xml"
124+
settings-file: ".idea/codeStyles/Project.xml"
125125
# job should fail in case there are changes
126126
- name: Check if any files changed
127127
run: git diff --exit-code
@@ -501,7 +501,7 @@ jobs:
501501

502502
- name: Detect changed jablib classes
503503
id: changed-jablib-files
504-
uses: tj-actions/changed-files@v45
504+
uses: tj-actions/changed-files@v47
505505
with:
506506
files: |
507507
jablib/src/main/java/**/*.java

.github/workflows/tests-pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
# No checkout -> the action uses GitHub's API (which is more reliable for submodule changes due to our submodule settings)
101101
- name: Get all submodule changes
102102
id: changes
103-
uses: tj-actions/changed-files@v46
103+
uses: tj-actions/changed-files@v47
104104
with:
105105
files: |
106106
jablib/src/main/abbrv.jabref.org
@@ -118,7 +118,7 @@ jobs:
118118
runs-on: ubuntu-latest
119119
steps:
120120
- if: github.head_ref == 'main'
121-
uses: actions/github-script@v7
121+
uses: actions/github-script@v8
122122
with:
123123
script: |
124124
core.setFailed('Pull requests should come from a branch other than "main"\n\n👉 Please read [the CONTRIBUTING guide](https://github.com/JabRef/jabref/blob/main/CONTRIBUTING.md#contributing) carefully again. 👈')

.gitignore

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -68,22 +68,11 @@ gradle.properties
6868

6969

7070
# IntelliJ IDEA
71-
.idea/workspace.xml
72-
.idea/checkstyleidea-libs
73-
74-
# only contains the reference name
75-
.idea/codeStyles/codeStyleConfig.xml
76-
77-
# references JDK_24 and the JDK name - high risk for conflicts
78-
.idea/misc.xml
79-
80-
# We don't modify these (and the defaults are good enough)
81-
.idea/.name
82-
.idea/IntelliLang.xml
83-
.idea/compiler.xml
84-
.idea/kotlinc.xml
85-
.idea/modules.xml
86-
71+
!.idea/codeStyles
72+
!.idea/.gitignore
73+
!.idea/checkstyle-idea.xml
74+
!.idea/vcs.xml
75+
.idea
8776
*.ipr
8877
*.iml
8978

0 commit comments

Comments
 (0)