Skip to content

Commit

Permalink
autofixes from Etherpad checkPlugins.js
Browse files Browse the repository at this point in the history
  • Loading branch information
JohnMcLear committed Jan 7, 2021
1 parent ac1c10c commit a148bbf
Show file tree
Hide file tree
Showing 4 changed files with 244 additions and 195 deletions.
14 changes: 12 additions & 2 deletions .github/workflows/npmpublish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,20 @@ jobs:
- run: git config user.email '41898282+github-actions[bot]@users.noreply.github.com'
- run: npm ci
- run: npm version patch
- run: git push --follow-tags
# `npm publish` must come after `git push` otherwise there is a race
# condition: If two PRs are merged back-to-back then master/main will be
# updated with the commits from the second PR before the first PR's
# workflow has a chance to push the commit generated by `npm version
# patch`. This causes the first PR's `git push` step to fail after the
# package has already been published, which in turn will cause all future
# workflow runs to fail because they will all attempt to use the same
# already-used version number. By running `npm publish` after `git push`,
# back-to-back merges will cause the first merge's workflow to fail but
# the second's will succeed.
- run: npm publish
env:
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
- run: git push --follow-tags

##ETHERPAD_NPM_V=1
##ETHERPAD_NPM_V=2
## NPM configuration automatically created using bin/plugins/updateAllPluginsScript.sh
4 changes: 2 additions & 2 deletions exportHTML.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ const findAllColorUsedOn = (pad) => {
};

// Add the props to be supported in export
exports.exportHtmlAdditionalTagsWithData = async (hookName, pad) => findAllColorUsedOn(pad).
map((name) => ['color', name]);
exports.exportHtmlAdditionalTagsWithData = async (hookName, pad) => findAllColorUsedOn(pad)
.map((name) => ['color', name]);

// Include CSS for HTML export
exports.stylesForExport = async (hookName, padId) => eejs
Expand Down
Loading

0 comments on commit a148bbf

Please sign in to comment.