Skip to content

Commit

Permalink
# v2024.3.21
Browse files Browse the repository at this point in the history
- jslint - Allow destructuring-assignment after function-definition.
- ci - Replace npm-package used to auto-build vscode-plugin, vsce to @vscode/vsce.
- test - Update test-function jstestDescribe() to wait awhile for imports to initialize before running tests.
- ci - Fix tmpdir in shell-function shBrowserScreenshot().
- vim - Allow installing vim-plugin to any directory, instead of hardcoded to ~/.vim/.
- ci - Update github-ci for actions/cache, actions/setup-python from nodejs v16 to nodejs v20.
- ci - Update shell-function shRollupFetch() to fix blank date-committed.
- ci - bugfix - Fix google-chrome unable to create screenshot because user-data-dir is /dev/null.
  • Loading branch information
kaizhu256 committed Mar 21, 2024
1 parent 45a5319 commit 87c8541
Show file tree
Hide file tree
Showing 6 changed files with 105 additions and 65 deletions.
2 changes: 1 addition & 1 deletion .ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ import moduleFs from "fs";
"type": "git",
"url": "https://github.com/jslint-org/jslint.git"
},
"version": "2024.3.1"
"version": "2024.3.21"
}, undefined, 4)
}
].map(async function ({
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
- jslint - add new warning requiring paren around plus-separated concatenations.
- jslint - try to improve parser to be able to parse jquery.js without stopping.

# v2024.3.1-beta
# v2024.3.21
- jslint - Allow destructuring-assignment after function-definition.
- ci - Replace npm-package used to auto-build vscode-plugin, vsce to @vscode/vsce.
- test - Update test-function jstestDescribe() to wait awhile for imports to initialize before running tests.
Expand Down
158 changes: 98 additions & 60 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Douglas Crockford <douglas@crockford.com>


# Status
| Branch | [master<br>(v2023.10.24)](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>(v2024.3.21)](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 Expand Up @@ -74,9 +74,9 @@ Douglas Crockford <douglas@crockford.com>
12. [License](#license)

13. [Devops Instruction](#devops-instruction)
- [pull-request merge](#pull-request-merge)
- [branch-master commit](#branch-master-commit)
- [branch-master publish](#branch-master-publish)
- [pull-request merge](#pull-request-merge)
- [vscode-jslint publish](#vscode-jslint-publish)


Expand Down Expand Up @@ -915,17 +915,38 @@ eval("1"); //jslint-ignore-line


<br><br>
### branch-master commit
- $ `shGitSquashPop <commit-beta> '# v20yy.mm.dd\n<release notes from CHANGELOG.md>'`
- verify correct-year `20yy`
- $ `git push origin alpha:branch-v20yy.mm.dd`
- $ `git push upstream alpha -f`
### pull-request merge
- find highest issue-number at https://github.com/jslint-org/jslint/issues/, https://github.com/jslint-org/jslint/pulls/, and add +1 to it for PR-xxx
```shell
(set -e
npm run test2
sh jslint_ci.sh shGitSquashPop beta '<commit-message>'
git diff origin/branch-xxx || true
git push origin alpha:branch-xxx -f
git push origin alpha -f
# git push upstream alpha -f
)
printf "EXIT_CODE=$?\n"
```
- verify ci-success for origin-branch-alpha
- https://github.com/kaizhu256/jslint/actions/workflows/ci.yml
- verify ci-success for upstream-branch-alpha
- https://github.com/jslint-org/jslint/actions/workflows/ci.yml
- goto https://github.com/kaizhu256/jslint/pulls
- click `New pull request`
- click `base repository: jslint-org/jslint base:beta`
- click `head repository: kaizhu256/jslint compare:branch-v20yy.mm.dd`
- goto https://github.com/jslint-org/jslint/compare/beta...kaizhu256:jslint:branch-xxx
- click `Create pull request`
- `Add a description` template:
```
Fixes #xxx.
- <primary-commit-message>
This PR will ...
this PR will additionally:
- <secondary-commit-message>
...
<screenshot>
```
- verify `commit into jslint-org:beta`
- click `Create pull request`
- verify ci-success for pull-request
Expand All @@ -934,73 +955,53 @@ eval("1"); //jslint-ignore-line
- verify ci-success for upstream-branch-beta
- https://github.com/jslint-org/jslint/actions/workflows/ci.yml
```shell
(set -e
git fetch upstream beta
git diff alpha..upstream/beta
# verify no diff between alpha..upstream/beta
git reset upstream/beta
git push origin alpha -f
git push origin alpha:beta
shMyciUpdate
git push upstream alpha -f
sh jslint_ci.sh shMyciUpdate
# git push upstream alpha -f
)
printf "EXIT_CODE=$?\n"
```
- verify ci-success for origin-branch-alpha
- https://github.com/kaizhu256/jslint/actions/workflows/ci.yml
- verify ci-success for upstream-branch-alpha
- https://github.com/jslint-org/jslint/actions/workflows/ci.yml
- click `Delete branch`
```shell
git push origin beta:master
git push upstream beta:master
```
- verify ci-success for origin-branch-master
- https://github.com/kaizhu256/jslint/actions/workflows/ci.yml
- verify ci-success for upstream-branch-master
- https://github.com/jslint-org/jslint/actions/workflows/ci.yml


<br><br>
### branch-master publish
- $ `git push upstream beta:master`
- verify ci-success for upstream-branch-master
- https://github.com/jslint-org/jslint/actions/workflows/ci.yml
- goto https://github.com/jslint-org/jslint/releases/new
- input tag `v20yy.mm.dd`
- click `Create new tag: v20yy.mm.dd on publish`
- verify correct-year `20yy`
- click `Target: master`
- input `Release title: v20yy.mm.dd - <description>`
- copy-paste release notes from CHANGELOG.md
- click `Generate release notes`
- click `Set as the latest release`
- click `Preview` and review
- click `Publish release`
- verify ci-success for upstream-branch-publish
- https://github.com/jslint-org/jslint/actions/workflows/ci.yml
- verify email-notification `Successfully published @jslint-org/jslint@20yy.mm.dd`


<br><br>
### pull-request merge
- find highest issue-number at https://github.com/jslint-org/jslint/issues/, https://github.com/jslint-org/jslint/pulls/, and add +1 to it for PR-xxx
### branch-master commit
- update CHANGELOG.md `#v20yy.mm.dd` to today's date
```shell
git push origin alpha:branch_xxx
git push upstream alpha
(set -e
npm run test2
sh jslint_ci.sh shGitSquashPop beta '
# v20yy.mm.dd
- <primary-commit-message>
- <secondary-commit-message>
'
git diff origin/branch-v20yy.mm.dd || true
git push origin alpha:branch-v20yy.mm.dd -f
git push origin alpha -f
# git push upstream alpha -f
)
printf "EXIT_CODE=$?\n"
```
- goto https://github.com/jslint-org/jslint/compare/beta...kaizhu256:jslint:alpha
- select branch to merge
- verify ci-success for origin-branch-alpha
- https://github.com/kaizhu256/jslint/actions/workflows/ci.yml
- verify ci-success for upstream-branch-alpha
- https://github.com/jslint-org/jslint/actions/workflows/ci.yml
- goto https://github.com/jslint-org/jslint/compare/beta...kaizhu256:jslint:branch-v20yy.mm.dd
- click `Create pull request`
- `Add a title` template: `#v20yy.mm.dd`
- `Add a description` template:
```
Fixes #xxx.
- <primary-commit-message>
This PR will ...
this PR will additionally:
- <secondary-commit-messages>
...
<screenshot>
<release notes from CHANGELOG.md>
```
- verify `commit into jslint-org:beta`
- click `Create pull request`
Expand All @@ -1010,20 +1011,57 @@ this PR will additionally:
- verify ci-success for upstream-branch-beta
- https://github.com/jslint-org/jslint/actions/workflows/ci.yml
```shell
(set -e
git fetch upstream beta
git diff alpha..upstream/beta
# verify no diff between alpha..upstream/beta
git reset upstream/beta
git push origin alpha -f
git push origin alpha:beta
shMyciUpdate
git push upstream alpha -f
sh jslint_ci.sh shMyciUpdate
# git push upstream alpha -f
)
printf "EXIT_CODE=$?\n"
```
- verify ci-success for origin-branch-alpha
- https://github.com/kaizhu256/jslint/actions/workflows/ci.yml
- verify ci-success for upstream-branch-alpha
- https://github.com/jslint-org/jslint/actions/workflows/ci.yml
- click `Delete branch`
```shell
git push origin beta:master
git push upstream beta:master
```
- verify ci-success for origin-branch-master
- https://github.com/kaizhu256/jslint/actions/workflows/ci.yml
- verify ci-success for upstream-branch-master
- https://github.com/jslint-org/jslint/actions/workflows/ci.yml


<br><br>
### branch-master publish
- $ `git push upstream beta:master`
- verify ci-success for upstream-branch-master
- https://github.com/jslint-org/jslint/actions/workflows/ci.yml
- goto https://github.com/jslint-org/jslint/releases/new
- `Choose a tag` template: `v20yy.mm.dd`
- click `Create new tag: v20yy.mm.dd on publish`
- verify correct-year `20yy`
- select `Target: master`
- select `Previous tag:auto`
- `Release title` template: `v20yy.mm.dd - <primary-commit-message>`
- `Describe this release` template:
```
- <primary-commit-message>
- <secondary-commit-message>
```
- click `Generate release notes`
- click `Set as the latest release`
- click `Preview` and review
- click `Publish release`
- verify ci-success for upstream-branch-publish
- https://github.com/jslint-org/jslint/actions/workflows/ci.yml
- verify email-notification `Successfully published @jslint-org/jslint@20yy.mm.dd`


<br><br>
Expand Down
2 changes: 1 addition & 1 deletion jslint.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ let jslint_charset_ascii = (
+ "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
+ "`abcdefghijklmnopqrstuvwxyz{|}~\u007f"
);
let jslint_edition = "v2024.3.1-beta";
let jslint_edition = "v2024.3.21";
let jslint_export; // The jslint object to be exported.
let jslint_fudge = 1; // Fudge starting line and starting
// ... column to 1.
Expand Down
4 changes: 3 additions & 1 deletion jslint_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,9 @@ import moduleHttps from "https";
/[\u0022\u0027]/g
), "").replace((
/\/branch-[a-z]*?\//g
), `/branch-${GITHUB_BRANCH0}/`).replace(new RegExp(
), `/branch-${GITHUB_BRANCH0}/`).replace((
/:(?:branch-v20yy\.mm\.dd|branch-xxx)\b/g
), ":alpha").replace(new RegExp(
`\\b${UPSTREAM_REPOSITORY}\\b`,
"g"
), GITHUB_REPOSITORY).replace(new RegExp(
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
"shCiArtifactUpload": 1,
"shCiPublishNpm": 1,
"type": "module",
"version": "2024.3.1-beta"
"version": "2024.3.21"
}

0 comments on commit 87c8541

Please sign in to comment.