Merge commit '1b94c5a91629c941f40459e7fe681cb5d3db489c'

zoushucai · Sep 4, 2023 · ef13d5b · ef13d5b
2 parents adb4748 + 1b94c5a
commit ef13d5b
Show file tree

Hide file tree

Showing 32 changed files with 227,289 additions and 227,193 deletions.
diff --git a/metadata/.github/workflows/automerge.yml b/metadata/.github/workflows/automerge.yml
@@ -1,36 +1,17 @@
 name: automerge
-on:
-  pull_request:
-    types:
-      - labeled
-      - unlabeled
-      - synchronize
-      - opened
-      - edited
-      - ready_for_review
-      - reopened
-      - unlocked
-  pull_request_review:
-    types:
-      - submitted
-  check_suite:
-    types:
-      - completed
-  status: {}
-  workflow_dispatch:
-  push:
-    branches:
-      - 'add-automerge'
+on: [push, pull_request, workflow_dispatch]
+
+permissions:
+  contents: write
+  pull-requests: write
 
 jobs:
-  automerge:
+  github-actions:
     runs-on: ubuntu-latest
+    if: ${{ github.actor == 'koppor' }}
     steps:
-      - id: automerge
-        name: automerge
-        uses: "pascalgn/[email protected]"
+      - name: Merge PR
+        run: gh pr merge --auto --squash "$PR_URL"
         env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          MERGE_FILTER_AUTHOR: "github-actions"
-          MERGE_METHOD: "merge"
-          MERGE_LABELS: ""
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/metadata/.gitignore b/metadata/.gitignore
@@ -444,3 +444,7 @@ $RECYCLE.BIN/
 *.lnk
 
 # End of https://www.toptal.com/developers/gitignore/api/linux,windows,intellij+all,microsoftoffice,latex
+
+# For repo 
+/*.csv
+journals/*.txt
diff --git a/metadata/CNAME b/metadata/CNAME
@@ -1 +1 @@
-abbrv.jabref.org
+abbrv.jabref.org
diff --git a/metadata/_config.yml b/metadata/_config.yml
@@ -1 +1 @@
-theme: jekyll-theme-slate
+theme: jekyll-theme-slate
diff --git a/metadata/journals/journal_abbreviations_acs.csv b/metadata/journals/journal_abbreviations_acs.csv
diff --git a/metadata/journals/journal_abbreviations_aea.csv b/metadata/journals/journal_abbreviations_aea.csv
diff --git a/metadata/journals/journal_abbreviations_ams.csv b/metadata/journals/journal_abbreviations_ams.csv
diff --git a/metadata/journals/journal_abbreviations_annee-philologique.csv b/metadata/journals/journal_abbreviations_annee-philologique.csv
diff --git a/metadata/journals/journal_abbreviations_astronomy.csv b/metadata/journals/journal_abbreviations_astronomy.csv
@@ -1,17 +1,17 @@
-Acta Astronomica;Acta Astron.
-Annual Review of Astronomy and Astrophysics;ARA&A
-Astronomische Nachrichten;Astron. Nachrichten
-Astronomy and Astrophysics;A&A
-Astrophysics and Space Science;Ap&SS
-GRB Coordinates Network;NASA-GCN
-Journal of Cosmology and Astro-Particle Physics;J. Cosmology & Astro-Part. Phys.
-Monthly Notices of the Royal Astronomical Society;MNRAS
-Nature;Nat
-New Astronomy Review;New Astron. Rev.
-Physics Reports;Phys. Rep.
-Publications of the Astronomical Society of the Pacific;PASP
-Science;Sci
-Space Science Reviews;Space Sci. Rev.
-The Astronomical Journal;AJ
-The Astrophysical Journal;ApJ
-The Astrophysical Journal Letters;ApJ
+"Acta Astronomica","Acta Astron."
+"Annual Review of Astronomy and Astrophysics","ARA&A"
+"Astronomische Nachrichten","Astron. Nachrichten"
+"Astronomy and Astrophysics","A&A"
+"Astrophysics and Space Science","Ap&SS"
+"GRB Coordinates Network","NASA-GCN"
+"Journal of Cosmology and Astro-Particle Physics","J. Cosmology & Astro-Part. Phys."
+"Monthly Notices of the Royal Astronomical Society","MNRAS"
+"Nature","Nat"
+"New Astronomy Review","New Astron. Rev."
+"Physics Reports","Phys. Rep."
+"Publications of the Astronomical Society of the Pacific","PASP"
+"Science","Sci"
+"Space Science Reviews","Space Sci. Rev."
+"The Astronomical Journal","AJ"
+"The Astrophysical Journal","ApJ"
+"The Astrophysical Journal Letters","ApJ"
diff --git a/metadata/journals/journal_abbreviations_dainst.csv b/metadata/journals/journal_abbreviations_dainst.csv
diff --git a/metadata/journals/journal_abbreviations_entrez.csv b/metadata/journals/journal_abbreviations_entrez.csv
diff --git a/metadata/journals/journal_abbreviations_general.csv b/metadata/journals/journal_abbreviations_general.csv
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		theme: jekyll-theme-slate
		theme: jekyll-theme-slate