Merge branch 'v1.0.2' into ctan

* v1.0.2: (32 commits) Releasing locales-pt-PT.xml Releasing locales-af-ZA.xml locales-ar.xml locales-bg-BG.xml locales-ca-AD.xml locales-cs-CZ.xml locales-cy-GB.xml locales-da-DK.xml locales-de-AT.xml locales-de-CH.xml locales-de-DE.xml locales-el-GR.xml locales-en-GB.xml locales-en-US.xml locales-es-CL.xml locales-es-ES.xml locales-es-MX.xml locales-et-EE.xml locales-eu.xml locales-fa-IR.xml locales-fi-FI.xml locales-fr-CA.xml locales-fr-FR.xml locales-he-IL.xml locales-hi-IN.xml locales-hr-HR.xml locales-hu-HU.xml locales-id-ID.xml locales-is-IS.xml locales-it-IT.xml locales-ja-JP.xml locales-km-KH.xml locales-ko-KR.xml locales-la.xml locales-lt-LT.xml locales-lv-LV.xml locales-mn-MN.xml locales-nb-NO.xml locales-nl-NL.xml locales-nn-NO.xml locales-pl-PL.xml locales-pt-BR.xml locales-pt-PT.xml locales-ro-RO.xml locales-ru-RU.xml locales-sk-SK.xml locales-sl-SI.xml locales-sr-RS.xml locales-sv-SE.xml locales-th-TH.xml locales-tr-TR.xml locales-uk-UA.xml locales-vi-VN.xml locales-zh-CN.xml locales-zh-TW.xml add new terms for 1.0.2 (citation-style-language#230) copied .github/workflows/merge.yaml from styles update to csl 2.0 bundle update copied .github/workflows/merge.yaml from styles Fix pt-BR translation Period after Übers. added (citation-style-language#241) Update README.md (citation-style-language#240) Update gems and Ruby (citation-style-language#239) copied .github/workflows/merge.yaml .github/workflows/sheldon.yaml from styles Bump addressable from 2.7.0 to 2.8.0 (citation-style-language#232) Bump nokogiri from 1.11.1 to 1.12.5 (citation-style-language#238) Fix spelling of October in Thai locale Update locales-pl-PL.xml Update of PL "accessed" translation Update of PL "accessed" translation Update spec_helper for pull-request testing (citation-style-language#220) Update to Ruby 3.0.0 (citation-style-language#218) ...
zepinglee · Mar 8, 2022 · 1ab7e36 · 1ab7e36
2 parents 0a50a95 + 7c7af24
commit 1ab7e36
Show file tree

Hide file tree

Showing 60 changed files with 16,254 additions and 332 deletions.
diff --git a/.github/workflows/merge.yaml b/.github/workflows/merge.yaml
@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - master
+    tags-ignore:
+      - '**'
   workflow_dispatch:
     inputs:
       commit_message:
@@ -24,45 +26,51 @@ jobs:
       with:
         fetch-depth: 0
 
+    - name: Release branch version
+      id: release
+      run: echo ::set-output name=branch::v1.0.2
     - name: Checkout release branch
       uses: actions/checkout@v2
       with:
-        ref: 'v1.0.1'
+        ref: ${{ steps.release.outputs.branch }}
         path: './release'
 
     - name: Check for relevant changes
       if: github.event_name == 'push'
       uses: dorny/paths-filter@v2
-      id: release
+      id: update
       with:
         list-files: shell
         filters: |
           updated:
-            - added|modified: [ '*.csl', '*.xml' ]
+            - added|modified: [ '*.csl', 'dependent/*.csl', '*.xml', 'README.md' ]
           deleted:
-            - deleted: [ '*.csl', '*.xml' ]
+            - deleted: [ '*.csl', 'dependent/*.csl', '*.xml' ]
+          workflows:
+            - added|modified: .github/workflows/*.yaml
 
     - name: Changed files
       if: github.event_name == 'push'
       run: |
-        echo updated: ${{ steps.release.outputs.updated_files }}
-        echo deleted: ${{ steps.release.outputs.deleted_files }}
+        echo updated: ${{ steps.update.outputs.updated_files }}
+        echo deleted: ${{ steps.update.outputs.deleted_files }}
+        echo workflows: ${{ steps.update.outputs.workflows_files }}
 
     - name: Set up Ruby
-      if: github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && (steps.release.outputs.updated == 'true' || steps.release.outputs.deleted == 'true'))
+      if: github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true'))
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7.1
+        ruby-version: 3.0.2
     - name: but use cache to speed that up
-      if: github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && (steps.release.outputs.updated == 'true' || steps.release.outputs.deleted == 'true'))
+      if: github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true'))
       uses: actions/cache@v2
       with:
         path: vendor/bundle
         key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
         restore-keys: |
           ${{ runner.os }}-gems-
     - name: Bundle install
-      if: github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && (steps.release.outputs.updated == 'true' || steps.release.outputs.deleted == 'true'))
+      if: github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true'))
       run: |
         bundle config path vendor/bundle
         bundle update sheldon --jobs 4 --retry 3
@@ -72,27 +80,39 @@ jobs:
       if: github.event_name == 'workflow_dispatch'
 
     - name: update the timestamps and add the changes
-      run: bundle exec sheldon --token=$GITHUB_TOKEN --verbose --release release ${{ steps.release.outputs.updated_files }}
-      if: github.event_name == 'push' && steps.release.outputs.updated == 'true'
+      run: bundle exec sheldon --token=$GITHUB_TOKEN --verbose --release release ${{ steps.update.outputs.updated_files }}
+      if: github.event_name == 'push' && steps.update.outputs.updated == 'true'
 
     - name: delete deleted files
-      run: cd release && git rm ${{ steps.release.outputs.deleted_files }}
-      if: github.event_name == 'push' && steps.release.outputs.deleted == 'true'
+      run: cd release && git rm ${{ steps.update.outputs.deleted_files }}
+      if: github.event_name == 'push' && steps.update.outputs.deleted == 'true'
 
     - uses: stefanzweifel/git-auto-commit-action@v4
       with:
         repository: 'release'
-        commit_message: Releasing ${{ steps.release.outputs.updated_files }} ${{ steps.release.outputs.deleted_files }}
-      if: github.event_name == 'push' && (steps.release.outputs.updated == 'true' || steps.release.outputs.deleted == 'true')
+        commit_message: Releasing ${{ steps.update.outputs.updated_files }} ${{ steps.update.outputs.deleted_files }}
+      if: github.event_name == 'push' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true')
 
     - uses: stefanzweifel/git-auto-commit-action@v4
       with:
         repository: 'release'
         commit_message: ${{ github.event.inputs.commit_message }}
       if: github.event_name == 'workflow_dispatch'
 
-    - name: ping distribution-updater
+    # https://styles-update.zotero.org:8826/ is for Zotero (styles page, API's citation server, client style updates, etc.)
+    - name: ping Zotero servers
       if: github.repository == 'citation-style-language/styles'
       run: |
-        curl -H "Authorization: $DISTRIBUTION_UPDATER_TOKEN" -F 'payload={"type":"pull_request","branch":"master","status":0,"commit":"'$GITHUB_SHA'"}' https://styles-update.zotero.org:8826/
-        curl -H "Authorization: $DISTRIBUTION_UPDATER_TOKEN" -F 'payload={"type":"pull_request","branch":"master","status":0,"commit":"'$GITHUB_SHA'"}' https://styles-update.zotero.org:8827/
+        curl -H 'Content-Length:' -H "Authorization: $ZOTERO_UPDATE_TOKEN" -F 'payload={"type":"push","branch":"${{ steps.release.outputs.branch }}","status":0,"commit":"'$GITHUB_SHA'"}' https://styles-update.zotero.org:8826/
+
+    - name: Copy workflows to locales repository
+      if: github.repository == 'citation-style-language/styles' && steps.update.outputs.workflows == 'true'
+      uses: drud/action-cross-commit@master
+      with:
+        source-folder: .github/workflows
+        destination-repository: https://csl-bot:${{ secrets.CSLBOT_TOKEN }}@github.com/citation-style-language/locales
+        destination-folder: .github/workflows
+        destination-branch: master
+        git-user: "csl-bot"
+        git-user-email: [email protected]
+        git-commit-message: copied ${{ steps.update.outputs.workflows_files }} from styles
diff --git a/.github/workflows/sheldon.yaml b/.github/workflows/sheldon.yaml
@@ -2,15 +2,34 @@ name: Pull request feedback
 
 on:
   pull_request_target:
-    types: [ opened, synchronize ]
+    types: [ opened, synchronize, labeled ]
 
 jobs:
   test:
     runs-on: ubuntu-latest
     env:
       GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
     steps:
-    - uses: actions/checkout@v2
+    # owner-test just checks out the PR -- this has an exfiltration risk, make SURE that
+    # this can only be triggered by people with repo write access -- such as people that can add
+    # labels to a PR
+    # https://securitylab.github.com/research/github-actions-preventing-pwn-requests
+    - name: Checkout repo for OWNER TEST
+      uses: actions/checkout@v2
+      if: contains(github.event.pull_request.labels.*.name, 'safe to test')
+      with:
+        ref: ${{ github.event.pull_request.head.sha }}
+
+    # otherwise, checkout the current master, and the pr to the subdirectory 'pr'
+    - name: Checkout base repo for pull-request test
+      uses: actions/checkout@v2
+      if: "! contains(github.event.pull_request.labels.*.name, 'safe to test')"
+    - name: Checkout pull-request
+      uses: actions/checkout@v2
+      if: "! contains(github.event.pull_request.labels.*.name, 'safe to test')"
+      with:
+        path: pull-request
+        ref: ${{ github.event.pull_request.head.sha }}
 
     - name: Check for relevant changes
       uses: dorny/paths-filter@v2
@@ -20,6 +39,7 @@ jobs:
         filters: |
           style:
             - '*.csl'
+            - 'dependent/*.csl'
           locale:
             - '*.xml'
 
@@ -28,36 +48,28 @@ jobs:
         echo changed: ${{ steps.changed.outputs.style_files }} ${{ steps.changed.outputs.locale_files }}
 
     - name: Set up Ruby
-      if: steps.changed.outputs.style == 'true' || steps.changed.outputs.locale == 'true'
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7.1
+        ruby-version: 3.0.2
     - name: but use cache to speed that up
-      if: steps.changed.outputs.style == 'true' || steps.changed.outputs.locale == 'true'
       uses: actions/cache@v2
       with:
         path: vendor/bundle
         key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
         restore-keys: |
           ${{ runner.os }}-gems-
     - name: Bundle install
-      if: steps.changed.outputs.style == 'true' || steps.changed.outputs.locale == 'true'
       run: |
         bundle config path vendor/bundle
         bundle update sheldon --jobs 4 --retry 3
 
-    - name: Apply the PR
-      if: steps.changed.outputs.style == 'true' || steps.changed.outputs.locale == 'true'
-      run: bundle exec sheldon --token=$GITHUB_TOKEN --apply
-
     - name: Welcome to a new PR
       if: github.event.action == 'opened' && steps.changed.outputs.style == 'true'
       run: bundle exec sheldon --token=$GITHUB_TOKEN --welcome
 
     - name: See if the styles/locales work
-      if: steps.changed.outputs.style == 'true' || steps.changed.outputs.locale == 'true'
       run: bundle exec rake
 
     - name: report
       if: (failure() || success()) && steps.changed.outputs.style == 'true'
-      run: bundle exec sheldon --token=$GITHUB_TOKEN --report --verbose
+      run: bundle exec sheldon --token=$GITHUB_TOKEN --${{ job.status }} --verbose
diff --git a/Gemfile b/Gemfile
@@ -1,9 +1,10 @@
-ruby '2.7.1'
+ruby '3.0.2'
 source 'https://rubygems.org'
 
 gem 'rake'
 gem 'rspec'
 gem 'nokogiri'
-gem 'csl', '~>1.0'
+gem 'csl', '~>2.0'
 gem 'fuubar'
+gem 'csl-styles', git: 'https://github.com/adam3smith/csl-styles.git'
 gem 'sheldon', git: 'https://github.com/citation-style-language/Sheldon.git'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,70 +1,124 @@
+GIT
+  remote: https://github.com/adam3smith/csl-styles.git
+  revision: 710db9105c367b11877290c9d0638ee53186d2f5
+  specs:
+    csl-styles (1.0.1.11)
+      csl (>= 1.0)
+
 GIT
   remote: https://github.com/citation-style-language/Sheldon.git
-  revision: 1962fad73610a3e0b1610e0c24c16669d584196b
+  revision: c88a062e987c67dee4841b5f09ca70e3c0c974d9
   specs:
-    sheldon (1.0.2)
-      citeproc-ruby
+    sheldon (1.0.30)
+      citeproc-ruby (~> 2.0)
       csl-styles
       diffy
       dotenv
+      erubis (~> 2.7)
+      faraday
+      faraday_middleware
+      git_diff
+      hashdiff (= 0.3.7)
       nokogiri
+      octokit (~> 4.0)
       ostruct
       reverse_markdown
 
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
     citeproc (1.0.10)
       namae (~> 1.0)
-    citeproc-ruby (1.1.12)
+    citeproc-ruby (2.0.0)
       citeproc (~> 1.0, >= 1.0.9)
-      csl (~> 1.5)
-    csl (1.5.1)
+      csl (~> 2.0)
+    csl (2.0.0)
       namae (~> 1.0)
-    csl-styles (1.0.1.10)
-      csl (~> 1.0)
-    diff-lcs (1.4.4)
+      rexml
+    diff-lcs (1.5.0)
     diffy (3.4.0)
     dotenv (2.7.6)
-    fuubar (2.5.0)
+    erubis (2.7.0)
+    faraday (1.8.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      multipart-post (>= 1.2, < 3)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday_middleware (1.2.0)
+      faraday (~> 1.0)
+    fuubar (2.5.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    mini_portile2 (2.4.0)
-    namae (1.0.1)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    ostruct (0.2.0)
-    rake (13.0.1)
-    reverse_markdown (2.0.0)
+    git_diff (0.4.3)
+    hashdiff (0.3.7)
+    mini_portile2 (2.6.1)
+    multipart-post (2.1.1)
+    namae (1.1.1)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
+    nokogiri (1.12.5-x64-mingw32)
+      racc (~> 1.4)
+    octokit (4.21.0)
+      faraday (>= 0.9)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    ostruct (0.5.2)
+    public_suffix (4.0.6)
+    racc (1.6.0)
+    rake (13.0.6)
+    reverse_markdown (2.1.1)
       nokogiri
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    ruby-progressbar (1.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
 
 PLATFORMS
   ruby
+  x64-mingw32
 
 DEPENDENCIES
-  csl (~> 1.0)
+  csl (~> 2.0)
+  csl-styles!
   fuubar
   nokogiri
   rake
   rspec
   sheldon!
 
 RUBY VERSION
-   ruby 2.7.1
+   ruby 3.0.2p107
 
 BUNDLED WITH
-   2.1.4
+   2.2.32