Skip to content

Commit

Permalink
- ci - add check for package.json.fileCount
Browse files Browse the repository at this point in the history
  • Loading branch information
kaizhu256 committed Mar 21, 2022
1 parent 6b5180d commit a2d281e
Show file tree
Hide file tree
Showing 8 changed files with 196 additions and 42 deletions.
14 changes: 7 additions & 7 deletions .ci.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
shCiArtifactUploadCustom() {(set -e
# this function will custom-upload build-artifacts to branch-gh-pages
# .cache - restore
if [ -d .cache ]
# .github_cache - restore
if [ "$GITHUB_ACTION" ] && [ -d .github_cache ]
then
cp -a .cache/* . # js-hack - */
cp -a .github_cache/* . || true # js-hack - */
fi
# add jslint.js
cp jslint.mjs jslint.js
Expand Down Expand Up @@ -152,11 +152,11 @@ import moduleChildProcess from "child_process";
# remove bloated json-coverage-files
rm .artifact/coverage/*.json # js-hack - */
rm .artifact/coverage_sqlite3_*/*.json # js-hack - */
# .cache - save
if [ ! -d .cache ]
# .github_cache - save
if [ "$GITHUB_ACTION" ] && [ ! -d .github_cache ]
then
mkdir .cache
cp -a node-sqlite3-* .cache
mkdir -p .github_cache
cp -a node-sqlite3-* .github_cache
fi
)}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
- uses: actions/cache@v2
with:
key: ${{ matrix.architecture }}-${{ matrix.node_version }}-${{ matrix.os }}-${{ hashFiles('./package.json') }}
path: .cache
path: .github_cache
# https://github.com/actions/setup-node
- uses: actions/setup-node@v2
with:
Expand All @@ -63,6 +63,6 @@ jobs:
# upload build-artifacts to branch-gh-pages
- run: sh jslint_ci.sh shCiArtifactUpload
env:
CI_NODE_VERSION_ARCH_PLATFORM: v16.x64.linux
CI_MAIN_JOB: v16.x64.linux
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# shCiArtifactUpload - end
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ jobs:
- x64
# - x86
node_version:
# - 12
# - 14
- 16
# - 18
os:
# - macos-latest
- ubuntu-latest
Expand Down
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# Changelog

# Todo
- jslint - add numeric-separators support
- jslint - move regexp-literals to module-level so they are explicitly cached, to improve performance
- cli - remove cli-option `--mode-vim-plugin`
- coverage - add macros `/*coverage-disable*/` and `/*coverage-enable*/`.
- coverage - support globbing `*` in cli-options `--exclude` and `--include`
- jslint - add html and css linting back into jslint.
- jslint - add new warning requiring paren around plus-separated concatenations.
- jslint - add numeric-separators support.
- jslint - relax warning against console.log and friends and deprecate directive `devel`
- jslint - require regexp to use open-form.
- jslint - try to improve parser to be able to parse jquery.js without stopping.
Expand All @@ -15,6 +16,9 @@
- node - after node-v14 is deprecated, remove shell-code `export "NODE_OPTIONS=--unhandled-rejections=strict"`.
- perf - improve performance by hoisting inlined regexps out of loops and subfunctions

# v2022.3.1-beta
- ci - add check for package.json.fileCount

# v2022.2.20
- test - migrate all tests to use jstestDescribe(), jstestIt()
- fs - rename jslint-wrapper-files to jslint_wrapper_xxx.xxx
Expand Down
2 changes: 1 addition & 1 deletion jslint.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ let jslint_charset_ascii = (
+ "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
+ "`abcdefghijklmnopqrstuvwxyz{|}~\u007f"
);
let jslint_edition = "v2022.2.20";
let jslint_edition = "v2022.3.1-beta";
let jslint_export; // The jslint object to be exported.
let jslint_fudge = 1; // Fudge starting line and starting
// ... column to 1.
Expand Down
Loading

0 comments on commit a2d281e

Please sign in to comment.