Skip to content

Commit f3e9fca

Browse files
MemeelMemeel
authored
Merge branch 'main' into fix-for-issue-14082
2 parents 064b1bf + 2844a09 commit f3e9fca

File tree

64 files changed

+6745
-5516
lines changed

Some content is hidden

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

64 files changed

+6745
-5516
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

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

‎.github/workflows/binaries.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ jobs:
326326
run: |
327327
rsync -rt --chmod=Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r --itemize-changes --stats --rsync-path="mkdir -p /var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }} && rsync" -e 'C:\ProgramData\chocolatey\lib\rsync\tools\bin\ssh.exe -p 9922 -i sshkey -o StrictHostKeyChecking=no' jabls-cli/build/packages/${{ matrix.os }}/ [email protected]:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/ || true
328328
- name: Upload jabgui to builds.jabref.org (linux, macOS)
329-
if: ${{ (steps.diskspace.outputs.available == 'true') && (startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu')) }}
329+
if: ${{ (steps.diskspace.outputs.available == 'true') && ((startsWith(matrix.os, 'macos') && (needs.conditions.outputs.should-notarize != 'true')) || startsWith(matrix.os, 'ubuntu')) }}
330330
shell: bash
331331
run: |
332332
rsync -rt --chmod=Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r --itemize-changes --stats --rsync-path="mkdir -p /var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }} && rsync" -e 'ssh -p 9922 -i sshkey -o StrictHostKeyChecking=no' jabgui/build/packages/${{ matrix.os }}/ [email protected]:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/ || true
@@ -375,12 +375,16 @@ jobs:
375375
runs-on: ubuntu-latest
376376
steps:
377377
- name: echo PR data
378+
env:
379+
PR_NUMBER: ${{ github.event.pull_request.number }}
380+
PR_URL: ${{ github.event.pull_request.html_url }}
381+
PR_BODY: ${{ github.event.pull_request.body }}
378382
run: |
379-
echo "PR Number: ${{ github.event.pull_request.number }}"
380-
echo "PR URL: ${{ github.event.pull_request.html_url }}"
383+
echo "PR Number: $PR_NUMBER"
384+
echo "PR URL: $PR_URL"
381385
cat <<EOF
382386
PR Body:
383-
${{ github.event.pull_request.body }}
387+
$PR_BODY
384388
EOF
385389
- name: Determine issue number
386390
id: get_issue_number
@@ -421,10 +425,6 @@ jobs:
421425
include:
422426
- os: macos-15
423427
displayName: macOS (ARM64)
424-
suffix: '_arm64'
425-
- os: macos-15-intel # intel image
426-
displayName: macOS
427-
suffix: ''
428428
runs-on: ${{ matrix.os }}
429429
steps:
430430
- name: Download from GitHub workflow artifacts store (macOS)
@@ -437,15 +437,15 @@ jobs:
437437
cd jabgui
438438
find . -type f
439439
xcrun notarytool store-credentials "notarytool-profile" --apple-id "[email protected]" --team-id "6792V39SK3" --password "${{ secrets.OSX_NOTARIZATION_APP_PWD }}"
440-
xcrun notarytool submit packages/${{ matrix.os }}/JabRef-${{ needs.build.outputs.major }}.${{ needs.build.outputs.minor }}${{ matrix.suffix}}.dmg --keychain-profile "notarytool-profile" --wait
441-
xcrun stapler staple packages/${{ matrix.os }}/JabRef-${{ needs.build.outputs.major }}.${{ needs.build.outputs.minor }}${{ matrix.suffix}}.dmg
440+
xcrun notarytool submit build/packages/${{ matrix.os }}/JabRef-${{ needs.build.outputs.major }}.${{ needs.build.outputs.minor }}${{ matrix.suffix}}.dmg --keychain-profile "notarytool-profile" --wait
441+
xcrun stapler staple build/packages/${{ matrix.os }}/JabRef-${{ needs.build.outputs.major }}.${{ needs.build.outputs.minor }}${{ matrix.suffix}}.dmg
442442
- name: Notarize pkg
443443
shell: bash
444444
run: |
445445
cd jabgui
446446
xcrun notarytool store-credentials "notarytool-profile" --apple-id "[email protected]" --team-id "6792V39SK3" --password "${{ secrets.OSX_NOTARIZATION_APP_PWD }}"
447-
xcrun notarytool submit packages/${{ matrix.os }}/JabRef-${{ needs.build.outputs.major }}.${{ needs.build.outputs.minor }}${{ matrix.suffix}}.pkg --keychain-profile "notarytool-profile" --wait
448-
xcrun stapler staple packages/${{ matrix.os }}/JabRef-${{ needs.build.outputs.major }}.${{ needs.build.outputs.minor }}${{ matrix.suffix}}.pkg
447+
xcrun notarytool submit build/packages/${{ matrix.os }}/JabRef-${{ needs.build.outputs.major }}.${{ needs.build.outputs.minor }}${{ matrix.suffix}}.pkg --keychain-profile "notarytool-profile" --wait
448+
xcrun stapler staple build/packages/${{ matrix.os }}/JabRef-${{ needs.build.outputs.major }}.${{ needs.build.outputs.minor }}${{ matrix.suffix}}.pkg
449449
- name: Upload to builds.jabref.org
450450
shell: bash
451451
run: |

‎.github/workflows/gource.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
include:
24-
- title: 'JabRef v6.0 (in development) | more information at contribute.jabref.org'
25-
# Last alpha release 2025-04-27, but want to have some seconds before
26-
start: '2025-04-15'
24+
- title: 'JabRef v6.0 (since alpha.3) | more information at contribute.jabref.org'
25+
# Last alpha release 2025-10-30, but want to have some seconds before
26+
start: '2025-10-29'
2727
end: ''
2828
file: 'jabref-v6.0-dev.mp4'
2929
# - title: 'JabRef v6.0-alpha2 | more information at contribute.jabref.org'

‎.github/workflows/link-issue.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,16 @@ jobs:
2626
issue_number: ${{ steps.get_issue_number.outputs.ticketNumber }}
2727
steps:
2828
- name: echo PR data
29+
env:
30+
PR_NUMBER: ${{ github.event.pull_request.number }}
31+
PR_URL: ${{ github.event.pull_request.html_url }}
32+
PR_BODY: ${{ github.event.pull_request.body }}
2933
run: |
30-
echo "PR Number: ${{ github.event.pull_request.number }}"
31-
echo "PR URL: ${{ github.event.pull_request.html_url }}"
34+
echo "PR Number: $PR_NUMBER"
35+
echo "PR URL: $PR_URL"
3236
cat <<EOF
3337
PR Body:
34-
${{ github.event.pull_request.body }}
38+
$PR_BODY
3539
EOF
3640
- name: Determine issue number
3741
id: get_issue_number

‎.github/workflows/on-pr-changes-requested-check.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Adapt PR status labels (Check)
2+
3+
on:
4+
pull_request_review:
5+
types: [submitted]
6+
7+
jobs:
8+
label-changes-required:
9+
if: github.event.review.state == 'changes_requested'
10+
runs-on: ubuntu-latest
11+
permissions:
12+
contents: read
13+
actions: write
14+
steps:
15+
- name: Create pr_number.txt
16+
run: echo "${{ github.event.pull_request.number }}" > pr_number.txt
17+
- uses: actions/upload-artifact@v5
18+
with:
19+
name: pr_number
20+
path: pr_number.txt

‎.github/workflows/on-pr-changes-requested-move-labels.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Adapt PR status labels (Move)
2+
3+
on:
4+
workflow_run:
5+
workflows: ["Adapt PR status labels (Check)"]
6+
types: [completed]
7+
8+
jobs:
9+
apply-labels:
10+
if: ${{ github.event.workflow_run.conclusion == 'success' }}
11+
runs-on: ubuntu-latest
12+
permissions:
13+
issues: write
14+
actions: read
15+
contents: read
16+
steps:
17+
- name: Download artifact from triggering run
18+
uses: actions/download-artifact@v6
19+
with:
20+
run-id: ${{ github.event.workflow_run.id }}
21+
name: pr_number
22+
github-token: ${{ secrets.GITHUB_TOKEN }}
23+
continue-on-error: true
24+
- name: Check for pr_number.txt
25+
id: check
26+
run: |
27+
if [ -f pr_number.txt ]; then
28+
echo "continue=true" >> "$GITHUB_OUTPUT"
29+
echo "pr_number=$(cat pr_number.txt)" >> "$GITHUB_OUTPUT"
30+
else
31+
echo "continue=false" >> "$GITHUB_OUTPUT"
32+
fi
33+
- name: Apply label operations
34+
if: steps.check.outputs.continue == 'true'
35+
run: |
36+
gh issue --repo ${{ github.repository }} edit ${{ steps.check.outputs.pr_number }} --remove-label "status: ready-for-review"
37+
gh issue --repo ${{ github.repository }} edit ${{ steps.check.outputs.pr_number }} --remove-label "status: awaiting-second-review"
38+
gh issue --repo ${{ github.repository }} edit ${{ steps.check.outputs.pr_number }} --add-label "status: changes-required"
39+
env:
40+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/on-pr-changes-requested.yml‎

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

‎.github/workflows/on-pr-closed.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,16 @@ jobs:
2525
issue_number: ${{ steps.get_issue_number.outputs.ticketNumber }}
2626
steps:
2727
- name: echo PR data
28+
env:
29+
PR_NUMBER: ${{ github.event.pull_request.number }}
30+
PR_URL: ${{ github.event.pull_request.html_url }}
31+
PR_BODY: ${{ github.event.pull_request.body }}
2832
run: |
29-
echo "PR Number: ${{ github.event.pull_request.number }}"
30-
echo "PR URL: ${{ github.event.pull_request.html_url }}"
33+
echo "PR Number: $PR_NUMBER"
34+
echo "PR URL: $PR_URL"
3135
cat <<EOF
3236
PR Body:
33-
${{ github.event.pull_request.body }}
37+
$PR_BODY
3438
EOF
3539
- name: Determine issue number
3640
id: get_issue_number

‎.github/workflows/on-pr-opened-updated-move-labels.yml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: On PR opened/updated (Labels)
2+
3+
on:
4+
workflow_run:
5+
workflows: ["On PR opened/updated"]
6+
types: [completed]
7+
8+
jobs:
9+
apply-labels:
10+
if: ${{ github.event.workflow_run.conclusion == 'success' }}
11+
runs-on: ubuntu-latest
12+
permissions:
13+
issues: write
14+
actions: read
15+
contents: read
16+
steps:
17+
- name: Download artifact from triggering run
18+
uses: actions/download-artifact@v6
19+
with:
20+
run-id: ${{ github.event.workflow_run.id }}
21+
name: pr_number
22+
continue-on-error: true
23+
- name: Check for pr_number.txt
24+
id: check
25+
run: |
26+
if [ -f pr_number.txt ]; then
27+
echo "continue=true" >> "$GITHUB_OUTPUT"
28+
echo "pr_number=$(cat pr_number.txt)" >> "$GITHUB_OUTPUT"
29+
else
30+
echo "continue=false" >> "$GITHUB_OUTPUT"
31+
fi
32+
- name: 'Remove label "status: changes-required"'
33+
if: steps.check.outputs.continue == 'true'
34+
run: |
35+
gh issue --repo ${{ github.repository }} edit ${{ steps.check.outputs.pr_number }} --remove-label "status: changes-required"
36+
env:
37+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

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

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,30 +17,20 @@ jobs:
1717
- name: Check PR mergeability
1818
id: check_mergeable
1919
run: |
20-
MERGEABLE=$(gh pr view --json mergeable ${{ github.event.number }} --template '{{.mergeable}}')
20+
MERGEABLE=$(gh pr view --json mergeable ${{ github.event.pull_request.number }} --template '{{.mergeable}}')
2121
if [ "$MERGEABLE" == "CONFLICTING" ]; then
2222
echo "❌ Merge conflicts"
2323
exit 1
2424
fi
2525
echo "✅ No merge conflicts"
2626
env:
2727
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
28-
remove_label:
29-
if: >
30-
(github.repository == 'JabRef/jabref')
31-
name: 'Remove label "status: changes-required"'
32-
runs-on: ubuntu-latest
33-
steps:
34-
- run: |
35-
gh issue --repo ${{ github.repository }} edit ${{ github.event.pull_request.number }} --remove-label "status: changes-required"
36-
env:
37-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3828
upload-pr-number:
3929
if: github.repository == 'JabRef/jabref'
4030
runs-on: ubuntu-latest
4131
steps:
4232
- name: Create pr_number.txt
43-
run: echo "${{ github.event.number }}" > pr_number.txt
33+
run: echo "${{ github.event.pull_request.number }}" > pr_number.txt
4434
- uses: actions/upload-artifact@v5
4535
with:
4636
name: pr_number

0 commit comments

Comments
 (0)