Skip to content

Commit 64b8d07

Browse files
committed
Merge main into qiyuan-inspireretry
- Integrated Sonia's 3.1 task (texkeys extraction and key cleanup) - Kept retry mechanism and validation from 3.2 task - Combined both features for complete INSPIRE fetcher improvement - Removed test documentation file
2 parents 9c6d882 + 67116d5 commit 64b8d07

Some content is hidden

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

44 files changed

+822
-200
lines changed

.github/dependabot.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ updates:
33
- package-ecosystem: gradle
44
directories:
55
- "/build-logic" # versions of 3rd party gradle plugins
6+
- "jablib"
67
- "/versions" # versions of 3rd party dependencies of all JabRef modules
78
- "/" # plugins
89
schedule:

.github/ghprcomment.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -201,11 +201,7 @@
201201
message: |
202202
Your pull request needs to link an issue correctly.
203203
204-
To ease organizational workflows, please link this pull-request to the issue with syntax as described in <https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue>:
205-
206-
> <h2 id="linking-a-pull-request-to-an-issue-using-a-keyword">Linking a pull request to an issue using a keyword</h2>
207-
> <p>You can link a pull request to an issue by using a supported keyword
208-
> in the pull request's description or in a commit message.
204+
To ease organizational workflows, please link this pull request to the issue by including a supported keyword in the pull request's description as per syntax described in [GitHub's documentation](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
209205
210206
### Examples
211207

.github/workflows/binaries.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ jobs:
199199
distribution: 'corretto'
200200
check-latest: true
201201
- name: Setup Gradle
202-
uses: gradle/actions/setup-gradle@v4
202+
uses: gradle/actions/setup-gradle@v5
203203
- name: Generate JBang cache key
204204
id: cache-key
205205
shell: bash

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
issues: write
4242
steps:
4343
- name: GreetingFirstTimeCodeContribution
44-
uses: peter-evans/create-or-update-comment@v4
44+
uses: peter-evans/create-or-update-comment@v5
4545
with:
4646
issue-number: ${{ github.event.issue.number || github.event.pull_request.number }}
4747
body: |

.github/workflows/pr-comment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
# This step runs in both cases using the proper variables.
9393
- name: ghprcomment@main
9494
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') }}
95-
uses: jbangdev/[email protected].0
95+
uses: jbangdev/[email protected].1
9696
with:
9797
script: https://github.com/koppor/ghprcomment/blob/main/ghprcomment.java
9898
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
@@ -96,7 +96,7 @@ jobs:
9696
distribution: 'corretto'
9797
check-latest: true
9898
- name: Setup Gradle
99-
uses: gradle/actions/setup-gradle@v4
99+
uses: gradle/actions/setup-gradle@v5
100100
- name: Generate JBang cache key
101101
id: cache-key
102102
shell: bash

.github/workflows/run-openrewrite.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
distribution: 'corretto'
3838
check-latest: true
3939
- name: Setup Gradle
40-
uses: gradle/actions/setup-gradle@v4
40+
uses: gradle/actions/setup-gradle@v5
4141
- name: Generate JBang cache key
4242
id: cache-key
4343
shell: bash

.github/workflows/sbom-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
cache: 'gradle'
2828

2929
- name: Setup Gradle
30-
uses: gradle/actions/setup-gradle@v4
30+
uses: gradle/actions/setup-gradle@v5
3131

3232
- name: Generate aggregated CycloneDX SBOM
3333
run: ./gradlew cyclonedxBom

.github/workflows/tests-code-fetchers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
distribution: 'corretto'
6161
check-latest: true
6262
- name: Setup Gradle
63-
uses: gradle/actions/setup-gradle@v4
63+
uses: gradle/actions/setup-gradle@v5
6464
- name: Run fetcher tests
6565
run: ./gradlew fetcherTest
6666
env:

.github/workflows/tests-code.yml

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
github_token: ${{ secrets.GITHUB_TOKEN }}
6363
checkstyle_config: 'config/checkstyle/checkstyle_reviewdog.xml'
6464
- name: Setup Gradle
65-
uses: gradle/actions/setup-gradle@v4
65+
uses: gradle/actions/setup-gradle@v5
6666
- name: Generate JBang cache key
6767
id: cache-key
6868
shell: bash
@@ -96,7 +96,7 @@ jobs:
9696
distribution: 'corretto'
9797
check-latest: true
9898
- name: Setup Gradle
99-
uses: gradle/actions/setup-gradle@v4
99+
uses: gradle/actions/setup-gradle@v5
100100
- name: Generate JBang cache key
101101
id: cache-key
102102
shell: bash
@@ -143,7 +143,7 @@ jobs:
143143
distribution: 'corretto'
144144
check-latest: true
145145
- name: Setup Gradle
146-
uses: gradle/actions/setup-gradle@v4
146+
uses: gradle/actions/setup-gradle@v5
147147
- name: Generate JBang cache key
148148
id: cache-key
149149
shell: bash
@@ -261,7 +261,7 @@ jobs:
261261
distribution: 'corretto'
262262
check-latest: true
263263
- name: Setup Gradle
264-
uses: gradle/actions/setup-gradle@v4
264+
uses: gradle/actions/setup-gradle@v5
265265
- name: Generate JBang cache key
266266
id: cache-key
267267
shell: bash
@@ -311,7 +311,7 @@ jobs:
311311
- name: Setup JBang
312312
uses: jbangdev/setup-jbang@main
313313
- name: Setup Gradle
314-
uses: gradle/actions/setup-gradle@v4
314+
uses: gradle/actions/setup-gradle@v5
315315
- name: Run ${{ matrix.module }} tests
316316
run: xvfb-run --auto-servernum ./gradlew :${{ matrix.module }}:check -x checkstyleJmh -x checkstyleMain -x checkstyleTest -x modernizer
317317
env:
@@ -346,7 +346,7 @@ jobs:
346346
distribution: 'corretto'
347347
check-latest: true
348348
- name: Setup Gradle
349-
uses: gradle/actions/setup-gradle@v4
349+
uses: gradle/actions/setup-gradle@v5
350350
- name: Generate JBang cache key
351351
id: cache-key
352352
shell: bash
@@ -396,7 +396,7 @@ jobs:
396396
distribution: 'corretto'
397397
check-latest: true
398398
- name: Setup Gradle
399-
uses: gradle/actions/setup-gradle@v4
399+
uses: gradle/actions/setup-gradle@v5
400400
- name: Generate JBang cache key
401401
id: cache-key
402402
shell: bash
@@ -463,6 +463,9 @@ jobs:
463463
- run: jbang build --fresh .jbang/JabKitLauncher.java
464464
- run: jbang build --fresh .jbang/JabLsLauncher.java
465465
- run: jbang build --fresh .jbang/JabSrvLauncher.java
466+
- run: jbang run .jbang/JabKitLauncher.java --help
467+
- run: jbang run .jbang/JabLsLauncher.java --help
468+
- run: jbang run .jbang/JabSrvLauncher.java --help
466469

467470
jbang-pr:
468471
name: JBang (PR)
@@ -499,7 +502,6 @@ jobs:
499502
jbang-
500503
- name: Setup JBang
501504
uses: jbangdev/setup-jbang@main
502-
503505
- name: Detect changed jablib classes
504506
id: changed-jablib-files
505507
uses: tj-actions/changed-files@v47
@@ -508,7 +510,6 @@ jobs:
508510
jablib/src/main/java/**/*.java
509511
files_ignore: |
510512
jablib/src/main/java/**/*-*.java
511-
512513
- name: Build ${{ matrix.launcher }} launcher including changed classes
513514
shell: bash
514515
# We always run, because changes in jabls, jabsrv also could cause JBang to fail
@@ -518,6 +519,8 @@ jobs:
518519
echo "//SOURCES ../$f" >> ".jbang/${{ matrix.launcher }}.java"
519520
done
520521
jbang build --fresh ".jbang/${{ matrix.launcher }}.java"
522+
- run: jbang ".jbang/${{ matrix.launcher }}.java" --help
523+
shell: bash
521524

522525
codecoverage:
523526
if: false
@@ -563,7 +566,7 @@ jobs:
563566
distribution: 'corretto'
564567
check-latest: true
565568
- name: Setup Gradle
566-
uses: gradle/actions/setup-gradle@v4
569+
uses: gradle/actions/setup-gradle@v5
567570
- name: Generate JBang cache key
568571
id: cache-key
569572
shell: bash
@@ -609,7 +612,7 @@ jobs:
609612
distribution: 'corretto'
610613
check-latest: true
611614
- name: Setup Gradle
612-
uses: gradle/actions/setup-gradle@v4
615+
uses: gradle/actions/setup-gradle@v5
613616
- run: ./gradlew traceRequirements
614617
- if: always()
615618
run: cat build/reports/tracing.txt
@@ -623,4 +626,4 @@ jobs:
623626
- uses: actions/checkout@v5
624627
with:
625628
show-progress: 'false'
626-
- uses: gradle/actions/wrapper-validation@v4
629+
- uses: gradle/actions/wrapper-validation@v5

0 commit comments

Comments
 (0)