Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into searchColPrefs
Browse files Browse the repository at this point in the history
* upstream/main:
  Add of ADRs 22 and 23 (#8256)
  [Bot] Update CSL styles (#8245)
  Replace styfle/cancel-workflow-action@0.9.1 by GitHub's "concurrency" feature (#8243)
  • Loading branch information
Siedlerchr committed Nov 18, 2021
2 parents dd306db + 578c106 commit 8cf3628
Show file tree
Hide file tree
Showing 35 changed files with 4,324 additions and 725 deletions.
1 change: 1 addition & 0 deletions .github/workflows/check-links.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
schedule:
# Run on the first of each month at 9:00 AM (See https://pubs.opengroup.org/onlinepubs/9699919799/utilities/crontab.html#tag_20_25_07)
- cron: "0 9 1 * *"
workflow_dispatch:

jobs:
markdown-link-check:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ env:
GRADLE_OPTS: -Xmx4g -Dorg.gradle.daemon=false -Dorg.gradle.vfs.watch=false
JAVA_OPTS: -Xmx4g

concurrency:
group: ${{ github.head_ref }}
cancel-in-progress: true

jobs:
build:
strategy:
Expand All @@ -45,10 +49,6 @@ jobs:
runs-on: ${{ matrix.os }}
name: Create installer and portable version for ${{ matrix.displayName }}
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.9.1
with:
access_token: ${{ github.token }}
- name: Fetch all history for all tags and branches
uses: actions/checkout@v2
with:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/gource.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
- gource
schedule:
- cron: '15 3 1 1,4,7,10 *'
workflow_dispatch:

jobs:
action:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/snap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ on:
# run on each day
- cron: "33 4 * * *"

concurrency:
group: snap-${{ github.head_ref }}
cancel-in-progress: true

jobs:
build:
runs-on: ubuntu-latest
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/tests-fetchers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ env:
AstrophysicsDataSystemAPIKey: ${{ secrets.AstrophysicsDataSystemAPIKey_FOR_TESTS }}
IEEEAPIKey: ${{ secrets.IEEEAPIKey_FOR_TESTS }}

concurrency:
group: fetcher-tests-${{ github.head_ref }}
cancel-in-progress: true

jobs:
fetchertests:
name: Fetcher tests
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ name: Tests
on:
push:
branches:
- master
- main
- main-release
pull_request:
# always run on pull requests
workflow_dispatch:

env:
SpringerNatureAPIKey: ${{ secrets.SpringerNatureAPIKey }}
Expand All @@ -14,15 +16,15 @@ env:
GRADLE_OPTS: -Xmx4g
JAVA_OPTS: -Xmx4g

concurrency:
group: tests-${{ github.head_ref }}
cancel-in-progress: true

jobs:
checkstyle:
name: Checkstyle
runs-on: ubuntu-latest
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.9.1
with:
access_token: ${{ github.token }}
- name: Checkout source
uses: actions/checkout@v2
- name: Set up JDK
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</contributor>
<category citation-format="author-date"/>
<summary>Style as per the May 2019 guidelines.</summary>
<updated>2021-04-22T13:05:29+00:00</updated>
<updated>2021-11-10T10:39:01+00:00</updated>
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
</info>
<locale xml:lang="en">
Expand Down Expand Up @@ -279,20 +279,12 @@
<group delimiter=". " suffix=".">
<text macro="title" prefix=", "/>
<text variable="number"/>
<date variable="issued">
<date-part name="year"/>
<date-part name="month" form="numeric-leading-zeros" prefix="-"/>
<date-part name="day" form="numeric-leading-zeros" prefix="-"/>
</date>
<text macro="issued"/>
</group>
</else-if>
<else-if type="webpage post-weblog post" match="any">
<group delimiter=". " prefix=" ">
<date variable="issued" prefix="(" suffix=")">
<date-part name="year"/>
<date-part name="month" form="numeric-leading-zeros" prefix="-"/>
<date-part name="day" form="numeric-leading-zeros" prefix="-"/>
</date>
<text macro="issued"/>
<text macro="title"/>
<text variable="container-title" font-style="italic"/>
<text variable="genre" prefix="[" suffix="]"/>
Expand Down
Loading

0 comments on commit 8cf3628

Please sign in to comment.