Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update 2021.3.15 #7

Merged
merged 15 commits into from
Mar 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 4 additions & 9 deletions .github/workflows/refresh-csl-subtrees.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,26 +27,21 @@ jobs:
run: git remote add -f csl-styles https://github.com/citation-style-language/styles.git
- name: Update csl-styles
run: |
git subtree pull --prefix buildres/csl/csl-styles csl-styles master --squash
git subtree pull --prefix buildres/csl/csl-styles csl-styles master --squash || true
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/
- 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 src/main/resources/csl-locales/
cp buildres/csl/csl-locales/locales-en-US.xml src/main/resources/csl-locales/
- uses: peter-evans/create-pull-request@v3
with:
token: ${{ secrets.GITHUB_TOKEN }}
branch: refresh-csl
- name: Report issues
if: failure()
uses: JasonEtco/create-an-issue@v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
filename: .github/failure-csl-update.md
commit-message: Update CSL styles
title: "[Bot] Update CSL styles"
1 change: 1 addition & 0 deletions .github/workflows/refresh-journal-lists.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,4 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
branch: update-journallist
title: "[Bot] Update Journal abbrev list"
commit-message: Update journal abbrev list
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve

### Fixed

- We fixed an issue where double-click onto PDF in file list under the 'General' tab section should just open the file. [#7465](https://github.com/JabRef/jabref/issues/7465)
- We fixed an issue where the dark theme did not extend to a group's custom color picker. [#7481](https://github.com/JabRef/jabref/issues/7481)
- We fixed an issue where choosing the fields on which autocompletion should not work in "Entry editor" preferences had no effect. [#7320](https://github.com/JabRef/jabref/issues/7320)
- We fixed an issue where the "Normalize page numbers" formatter did not replace en-dashes or em-dashes with a hyphen-minus sign. [#7239](https://github.com/JabRef/jabref/issues/7239)
- We fixed an issue with the style of highlighted check boxes while searching in preferences. [#7226](https://github.com/JabRef/jabref/issues/7226)
Expand Down Expand Up @@ -62,6 +64,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
- We fixed an issue where drag and drop of bib files for opening resulted in uncaught exceptions [#7464](https://github.com/JabRef/jabref/issues/7464)
- We fixed an issue where columns shrink in width when we try to enlarge JabRef window. [#6818](https://github.com/JabRef/jabref/issues/6818)
- We fixed an issue where Content selector does not seem to work for custom fields. [#6819](https://github.com/JabRef/jabref/issues/6819)
- We fixed an issue in which a linked online file consisting of a web page was saved as an invalid pdf file upon being downloaded. The user is now notified when downloading a linked file results in an HTML file. [#7452](https://github.com/JabRef/jabref/issues/7452)

### Removed

Expand Down
5 changes: 1 addition & 4 deletions buildres/csl/csl-locales/.github/workflows/merge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
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.0
- name: but use cache to speed that up
if: github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true'))
uses: actions/cache@v2
Expand Down Expand Up @@ -98,13 +98,10 @@ jobs:
if: github.event_name == 'workflow_dispatch'

# https://styles-update.zotero.org:8826/ is for Zotero (styles page, API's citation server, client style updates, etc.)
# https://styles-update.zotero.org:8827/ is for the Zotero-run instance of https://github.com/citation-style-language/distribution-updater
# that performs the updating of the (to-be-deprecated) https://github.com/citation-style-language/styles-distribution/ repo
- name: ping Zotero servers
if: github.repository == 'citation-style-language/styles'
run: |
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/
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:8827/

- name: Copy workflows to locales repository
if: github.repository == 'citation-style-language/styles' && steps.update.outputs.workflows == 'true'
Expand Down
35 changes: 23 additions & 12 deletions buildres/csl/csl-locales/.github/workflows/sheldon.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -29,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.0
- 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
Loading