Fix CSL update (#7592)

JabRef · Mar 30, 2021 · cf3a240 · cf3a240
1 parent c5b3a43
commit cf3a240
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -3,9 +3,9 @@ on: [pull_request]
 
 jobs:
   automerge:
-    name: Automerge Dependabot
+    name: Automerge Dependency Updates
     runs-on: ubuntu-latest
-    if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || github.event.label.name == 'dependencies'
+    if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || contains(github.event.pull_request.labels.*.name, 'dependencies')
     steps:
       - name: 'Wait for status checks'
         id: waitforstatuschecks
@@ -24,6 +24,6 @@ jobs:
         uses: pascalgn/automerge-action@v0.13.1
         if: steps.waitforstatuschecks.outputs.status == 'success'
         env:
-          MERGE_METHOD: "squash"
+          MERGE_METHOD: "merge"
           MERGE_LABELS: ""
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/refresh-csl-subtrees.yml b/.github/workflows/refresh-csl-subtrees.yml
@@ -31,17 +31,21 @@ jobs:
           cp buildres/csl/csl-styles/acm-siggraph.csl src/main/resources/csl-styles/
           cp buildres/csl/csl-styles/ieee.csl src/main/resources/csl-styles/
           cp buildres/csl/csl-styles/turabian-author-date.csl src/main/resources/csl-styles/
+          git add .
+          git commit -m"Refresh example styles" || true
       - name: Add csl-locales remote
         run: git remote add -f csl-locales https://github.com/citation-style-language/locales.git
       - name: Update csl-locales
         run: |
           git subtree pull --prefix buildres/csl/csl-locales csl-locales master --squash || true
-          git subtree pull --prefix buildres/csl/csl-locales csl-locales master --squash
           cp buildres/csl/csl-locales/locales.json src/main/resources/csl-locales/
           cp buildres/csl/csl-locales/locales-en-US.xml src/main/resources/csl-locales/
+          git add .
+          git commit -m"Refresh example styles" || true
       - uses: peter-evans/create-pull-request@v3
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.GH_TOKEN_UPDATE_GRADLE_WRAPPER }}
           branch: refresh-csl
           commit-message: Update CSL styles
           title: "[Bot] Update CSL styles"
+          labels: dependencies