Skip to content

Commit

Permalink
Merge branch 'main' into eslint-js-recommended
Browse files Browse the repository at this point in the history
  • Loading branch information
JoshuaKGoldberg authored Jan 2, 2025
2 parents 54695d8 + 664e1f4 commit ed6710a
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/release-please/manifest.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{".":"11.0.2"}
{".":"11.1.0"}
6 changes: 4 additions & 2 deletions .github/workflows/mocha.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ jobs:
smoke:
uses: ./.github/workflows/npm-script.yml
with:
node-versions: '14,22,lts/*'
# The 22.11.0 is instead of lts per https://github.com/mochajs/mocha/issues/5278
node-versions: '18,20,22.11.0'
npm-script: test-smoke

test-node-lts:
Expand Down Expand Up @@ -64,7 +65,8 @@ jobs:
coverage: false
with:
os: 'ubuntu-latest,windows-latest'
node-versions: '14,16,18,20,22'
# The 22.11.0 is instead of 22 per https://github.com/mochajs/mocha/issues/5278
node-versions: '14,16,18,20,22.11.0'
npm-script: test-node:${{ matrix.test-part }}
coverage: ${{ matrix.coverage }}

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/npm-script.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ jobs:
strategy:
fail-fast: false
matrix:
node_version: ${{ fromJson(needs.resolve-inputs.outputs.nodeVersions || '["lts/*"]') }}
# The 22.11.0 is instead of "lts/*" per https://github.com/mochajs/mocha/issues/5278
node_version: ${{ fromJson(needs.resolve-inputs.outputs.nodeVersions || '["22.11.0"]') }}
os: ${{ fromJson(needs.resolve-inputs.outputs.os || '["ubuntu-latest"]') }}
browser: ${{ fromJson(needs.resolve-inputs.outputs.browsers || '[""]') }}
steps:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ jobs:
show-progress: false
- uses: actions/setup-node@v4
with:
node-version: lts/*
# The 22.11.0 is instead of lts per https://github.com/mochajs/mocha/issues/5278
node-version: '22.11.0'
registry-url: 'https://registry.npmjs.org'

- name: Install dependencies
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## [11.1.0](https://github.com/mochajs/mocha/compare/v11.0.2...v11.1.0) (2025-01-02)


### 🌟 Features

* bump yargs to 17 ([#5165](https://github.com/mochajs/mocha/issues/5165)) ([8f1c8d8](https://github.com/mochajs/mocha/commit/8f1c8d888b0104afcd95ca55a517320399755749))
* replace `strip-ansi` with `util.stripVTControlCharacters` ([#5267](https://github.com/mochajs/mocha/issues/5267)) ([3c191c0](https://github.com/mochajs/mocha/commit/3c191c05d9db1e99aec9b600edac2ce10a6b6d71)), closes [#5265](https://github.com/mochajs/mocha/issues/5265)

## [11.0.2](https://github.com/mochajs/mocha/compare/v11.0.1...v11.0.2) (2024-12-09)


Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mocha",
"version": "11.0.2",
"version": "11.1.0",
"type": "commonjs",
"description": "simple, flexible, fun test framework",
"keywords": [
Expand Down

0 comments on commit ed6710a

Please sign in to comment.