Skip to content

Commit

Permalink
Merge pull request #365 from kaizhu256/v2021.10.20
Browse files Browse the repository at this point in the history
# v2021.10.20 - add cli-command v8_coverage_report - and - npm publish to @jslint-org/jslint
  • Loading branch information
kaizhu256 committed Oct 20, 2021
2 parents 037da81 + a7dcaa1 commit dbb0759
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 9 deletions.
15 changes: 11 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ on:
- master
- sandbox
jobs:


# npm publish - start
build:
strategy:
matrix:
Expand All @@ -32,30 +35,34 @@ jobs:
contents: read
packages: write
steps:
- uses: actions/checkout@v2

# Setup .npmrc file to publish to GitHub Packages
- run: rm -f /home/runner/work/_temp/.npmrc
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node_version }}
architecture: ${{ matrix.architecture }}
registry-url: 'https://npm.pkg.github.com'
# Defaults to the user or organization that owns the workflow file
# scope: '@octocat'
- run: npm install
# Publish to GitHub Packages
- run: npm publish
- run: npm install
- run: npm publish --access public
env:
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

# Setup .npmrc file to publish to npm
- run: rm -f /home/runner/work/_temp/.npmrc
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node_version }}
architecture: ${{ matrix.architecture }}
registry-url: 'https://registry.npmjs.org'
- run: npm install
# Publish to npm
- run: npm install
- run: npm publish --access public
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
# npm publish - end
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
- jslint - try to improve parser to be able to parse jquery.js without stopping.
- node - after node-v14 is deprecated, remove shell-code `export "NODE_OPTIONS=--unhandled-rejections=strict"`.

# v2021.10.1-beta
# v2021.10.20
- ci - add release-trigger to publish to `@jslint-org/jslint`
- bugfix - fix coverage-report having incorrect http-link to index.html
- bugfix - fix false warning `uninitialized 'bb'` in code `/*jslint node*/\nlet {aa:bb} = {}; bb();`
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Douglas Crockford <douglas@crockford.com>


# Status
| Branch | [master<br>(v2021.9.20)](https://github.com/jslint-org/jslint/tree/master) | [beta<br>(Web Demo)](https://github.com/jslint-org/jslint/tree/beta) | [alpha<br>(Development)](https://github.com/jslint-org/jslint/tree/alpha) |
| Branch | [master<br>(v2021.10.20)](https://github.com/jslint-org/jslint/tree/master) | [beta<br>(Web Demo)](https://github.com/jslint-org/jslint/tree/beta) | [alpha<br>(Development)](https://github.com/jslint-org/jslint/tree/alpha) |
|--:|:--:|:--:|:--:|
| CI | [![ci](https://github.com/jslint-org/jslint/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/jslint-org/jslint/actions?query=branch%3Amaster) | [![ci](https://github.com/jslint-org/jslint/actions/workflows/ci.yml/badge.svg?branch=beta)](https://github.com/jslint-org/jslint/actions?query=branch%3Abeta) | [![ci](https://github.com/jslint-org/jslint/actions/workflows/ci.yml/badge.svg?branch=alpha)](https://github.com/jslint-org/jslint/actions?query=branch%3Aalpha) |
| Coverage | [![coverage](https://jslint-org.github.io/jslint/branch-master/.artifact/coverage/coverage_badge.svg)](https://jslint-org.github.io/jslint/branch-master/.artifact/coverage/index.html) | [![coverage](https://jslint-org.github.io/jslint/branch-beta/.artifact/coverage/coverage_badge.svg)](https://jslint-org.github.io/jslint/branch-beta/.artifact/coverage/index.html) | [![coverage](https://jslint-org.github.io/jslint/branch-alpha/.artifact/coverage/coverage_badge.svg)](https://jslint-org.github.io/jslint/branch-alpha/.artifact/coverage/index.html) |
Expand Down
2 changes: 1 addition & 1 deletion jslint.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ let jslint_charset_ascii = (
+ "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
+ "`abcdefghijklmnopqrstuvwxyz{|}~\u007f"
);
let jslint_edition = "v2021.10.1-beta";
let jslint_edition = "v2021.10.20";
let jslint_export; // The jslint object to be exported.
let jslint_fudge = 1; // Fudge starting line and starting
// ... column to 1.
Expand Down
10 changes: 10 additions & 0 deletions jslint_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1202,6 +1202,16 @@ import moduleFs from "fs";
' "$@" # '
)}

shNpmPublishV0() {(set -e
# this function will npm-publish name $1 with bare package.json
local DIR
DIR=/tmp/shNpmPublishV0
rm -rf "$DIR" && mkdir -p "$DIR" && cd "$DIR"
printf "{\"name\":\"$1\",\"version\":\"0.0.1\"}\n" > package.json
shift
npm publish "$@"
)}

shRawLibFetch() {(set -e
# this function will fetch raw-lib from $1
node --input-type=module -e '
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"counter": 7,
"description": "JSLint, The JavaScript Code Quality and Coverage Tool",
"fileCount": 26,
"fileCount": 27,
"license": "UNLICENSE",
"name": "@jslint-org/jslint",
"repository": {
Expand All @@ -12,5 +12,5 @@
"test": "node jslint.mjs v8_coverage_report=.artifact/coverage node test.mjs",
"test2": "sh jslint_ci.sh shCiBase"
},
"version": "2021.10.1-beta"
"version": "2021.10.20"
}

0 comments on commit dbb0759

Please sign in to comment.