Merge pull request #1 from JabRef/master

update 2021.3.3
XDZhelheim · Mar 3, 2021 · 4851e84 · 4851e84
2 parents e4c83cf + b856dd4
commit 4851e84
Show file tree

Hide file tree

Showing 183 changed files with 2,083 additions and 2,064 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -11,7 +11,7 @@ The title of the PR must not reference an issue, because GitHub does not support
 - Please don't remove any items, just leave them unchecked if they are not applicable.
 -->
 
-- [ ] Change in CHANGELOG.md described (if applicable)
+- [ ] Change in `CHANGELOG.md` described in a way that is understandable for the average user (if applicable)
 - [ ] Tests created for changes (if applicable)
 - [ ] Manually tested changed features in running JabRef (always required)
 - [ ] Screenshots added in PR description (for UI changes)

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -5,18 +5,23 @@ jobs:
   automerge:
     name: Automerge Dependabot
     runs-on: ubuntu-latest
-    if: github.actor == 'dependabot[bot]'
+    if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
     steps:
       - name: 'Wait for status checks'
         id: waitforstatuschecks
         uses: "WyriHaximus/github-action-wait-for-status@v1.3"
         with:
-          ignoreActions: Automerge Dependabot
+          ignoreActions: Automerge Dependabot,Code coverage,Create snapcraft image,Deploy binaries on builds.jabref.org,codecov/project,markdown-link-check
           checkInterval: 13
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Auto approve
+        uses: hmarr/auto-approve-action@v2.0.0
+        if: steps.waitforstatuschecks.outputs.status == 'success'
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Merge pull requests
-        uses: pascalgn/automerge-action@v0.13.0
+        uses: pascalgn/automerge-action@v0.13.1
         if: steps.waitforstatuschecks.outputs.status == 'success'
         env:
           MERGE_METHOD: "squash"

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
@@ -42,20 +42,20 @@ jobs:
     name: Create installer and portable version for ${{ matrix.displayName }}
     steps:
       - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.7.0
+        uses: styfle/cancel-workflow-action@0.8.0
         with:
           access_token: ${{ github.token }}
       - name: Fetch all history for all tags and branches
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
       - name: Install GitVersion
-        uses: gittools/actions/gitversion/setup@v0.9.8
+        uses: gittools/actions/gitversion/setup@v0.9.9
         with:
           versionSpec: "5.x"
       - name: Run GitVersion
         id: gitversion
-        uses: gittools/actions/gitversion/execute@v0.9.8
+        uses: gittools/actions/gitversion/execute@v0.9.9
       - name: Set up JDK 15 for linux and mac
         uses: actions/setup-java@v1
         with:
@@ -162,12 +162,12 @@ jobs:
       - name: Fetch all history for all tags and branches
         run: git fetch --prune --unshallow
       - name: Install GitVersion
-        uses: gittools/actions/gitversion/setup@v0.9.8
+        uses: gittools/actions/gitversion/setup@v0.9.9
         with:
           versionSpec: '5.x'
       - name: Run GitVersion
         id: gitversion
-        uses: gittools/actions/gitversion/execute@v0.9.8
+        uses: gittools/actions/gitversion/execute@v0.9.9
       - name: Get linux binaries
         uses: actions/download-artifact@master
         with:

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.7.0
+        uses: styfle/cancel-workflow-action@0.8.0
         with:
           access_token: ${{ github.token }}
       - name: Checkout source