Skip to content

Commit

Permalink
Merge branch 'master' into fix-967
Browse files Browse the repository at this point in the history
  • Loading branch information
koppor authored Jan 21, 2021
2 parents 910c592 + 94f4c1e commit 513c68c
Show file tree
Hide file tree
Showing 147 changed files with 1,825 additions and 1,353 deletions.
3 changes: 0 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ gradlew text eol=lf
# windows line endings at windows files
*.bat text eol=crlf

# required for proper releasing
AUTHORS text eol=lf

# ensure that line endings of *.java, and *.properties are normalized
*.java text
*.properties text
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.6.0
uses: styfle/cancel-workflow-action@0.7.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.7
uses: gittools/actions/gitversion/setup@v0.9.8
with:
versionSpec: "5.x"
- name: Run GitVersion
id: gitversion
uses: gittools/actions/gitversion/execute@v0.9.7
uses: gittools/actions/gitversion/execute@v0.9.8
- name: Set up JDK 15 for linux and mac
uses: actions/setup-java@v1
with:
Expand Down Expand Up @@ -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.7
uses: gittools/actions/gitversion/setup@v0.9.8
with:
versionSpec: '5.x'
- name: Run GitVersion
id: gitversion
uses: gittools/actions/gitversion/execute@v0.9.7
uses: gittools/actions/gitversion/execute@v0.9.8
- name: Get linux binaries
uses: actions/download-artifact@master
with:
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/snap.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Snap

on:
workflow_dispatch:
push:
branches:
- snapcraft
Expand Down Expand Up @@ -28,12 +29,12 @@ jobs:
uses: actions/checkout@v2
# The image relies on https://builds.jabref.org/master/JabRef-5.0-portable_linux.tar.gz^
# See snap/snapcraft.yml for details
- name: Build snap (1) Run build
- name: Run snapcraft build
uses: snapcore/action-build@v1
id: snapcraft
with:
snapcraft-args: "--debug"
- name: Build snap (2) Upload snap
- name: Upload snap
if: ${{ steps.checksecrets.outputs.secretspresent }}
uses: snapcore/action-publish@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests-fetchers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
with:
java-version: 14
- uses: actions/cache@v1
name: Restore gradle chache
name: Restore gradle cache
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
Expand Down
42 changes: 5 additions & 37 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.6.0
uses: styfle/cancel-workflow-action@0.7.0
with:
access_token: ${{ github.token }}
- name: Checkout source
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
with:
java-version: 14
- uses: actions/cache@v1
name: Restore gradle chache
name: Restore gradle cache
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
with:
java-version: 14
- uses: actions/cache@v1
name: Restore gradle chache
name: Restore gradle cache
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
Expand Down Expand Up @@ -154,7 +154,7 @@ jobs:
with:
java-version: 14
- uses: actions/cache@v1
name: Restore gradle chache
name: Restore gradle cache
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
Expand Down Expand Up @@ -204,7 +204,7 @@ jobs:
with:
java-version: 14
- uses: actions/cache@v1
name: Restore gradle chache
name: Restore gradle cache
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
Expand Down Expand Up @@ -232,35 +232,3 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: gradle/wrapper-validation-action@v1
checkauthors:
name: "Validate AUTHORS"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
# full checkout needed for authors generation
fetch-depth: 0
- name: "All authors of this PR listed in AUTHORS"
id: authors_check
shell: bash
run: |
git config user.name "JabRef Author Checker [bot]"
git config user.email "noreply@jabref.org"
./scripts/generate-authors.sh
set +o pipefail
added=$(git diff HEAD --no-ext-diff --unified=0 -a --no-prefix | egrep "^\+[^+]" | sed "s/^\+//")
if [ -z "$added" ]; then
echo "No authors added"
exit 0
fi
echo "Authors found in this PR not listed in the AUTHORS file."
echo
echo "The JabRef maintainers will add the following name to the AUTHORS file"
echo
echo -e "$added"
echo
echo "In case you want to use a different one, please comment here and adjust your name in your git configuration for future commits"
echo
echo "Just adding yourself into the AUTHORS file does not help as it is overwritten by our script ./scripts/generate-authors."
echo "Read more on the AUTHORS file at found at https://github.com/JabRef/jabref/blob/master/CONTRIBUTING.md#author-credits"
exit 1
217 changes: 0 additions & 217 deletions .mailmap

This file was deleted.

Loading

0 comments on commit 513c68c

Please sign in to comment.