Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 4 additions & 86 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,81 +67,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest]
node-version:
- "4"
- "5"
- "6"
- "7"
- "8"
- "9"
- "10"
- "11"
- "12"
- "13"
- "14"
- "15"
- "16"
- "17"
- "18"
- "19"
- "20"
- "21"
- "22"
- "23"
- "24"
# Use supported versions of our testing tools under older versions of Node
# Install npm in some specific cases where we need to
include:
- node-version: "4.5"
npm-i: "mocha@5.2.0 nyc@11.9.0"
npm-rm: 'iconv'

- node-version: "5.10"
npm-i: "mocha@5.2.0 nyc@11.9.0"
# fixes https://github.com/npm/cli/issues/681
npm-version: npm@2.15.11
npm-rm: 'iconv'

- node-version: "6"
npm-i: "mocha@6.2.2 nyc@14.1.1"
npm-version: npm@6.13.4
npm-rm: 'iconv'

- node-version: "7"
npm-i: "mocha@6.2.2 nyc@14.1.1"
npm-version: npm@6.13.4
npm-rm: 'iconv'

- node-version: "8"
npm-i: "mocha@7.2.0 nyc@14.1.1"
npm-version: npm@6.13.4
npm-rm: 'iconv'

- node-version: "9"
npm-i: "mocha@7.2.0 nyc@14.1.1"
npm-rm: 'iconv'

- node-version: "10"
npm-i: "mocha@8.4.0"
npm-rm: 'iconv'

- node-version: "11"
npm-i: "mocha@8.4.0"
npm-rm: 'iconv'

- node-version: "12"
npm-i: "mocha@9.2.2"
npm-rm: 'iconv'

- node-version: "13"
npm-i: "mocha@9.2.2"
npm-rm: 'iconv'

- node-version: "14"
npm-rm: 'iconv'

- node-version: "15"
npm-rm: 'iconv'
node-version: ["18.0.0", "18", "19", "20", "21", "22", "23", "24"]

runs-on: ${{ matrix.os }}
steps:
Expand All @@ -163,14 +89,6 @@ jobs:
npm config set loglevel error
shell: bash

- name: Remove npm module(s) ${{ matrix.npm-rm }}
run: npm rm --silent --save-dev ${{ matrix.npm-rm }} neostandard @stylistic/eslint-plugin-js @stylistic/eslint-plugin eslint
if: matrix.npm-rm != ''

- name: Install Node version specific dev deps
if: ${{ matrix.npm-i != '' }}
run: npm install --save-dev ${{ matrix.npm-i }}

- name: Install dependencies
run: npm install

Expand Down Expand Up @@ -227,7 +145,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: ["12", "*"]
node-version: ["18", "*"]

runs-on: ubuntu-latest
steps:
Expand All @@ -240,8 +158,8 @@ jobs:
with:
node-version: ${{ matrix.node-version }}

- name: Remove npm module(s) iconv, eslint, neostandard, @stylistic/eslint-plugin-js, @stylistic/eslint-plugin
run: npm rm --silent --save-dev iconv neostandard @stylistic/eslint-plugin-js @stylistic/eslint-plugin eslint
- name: Install dependencies
run: npm install

- name: Webpack test
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
"url": "https://github.com/pillarjs/iconv-lite.git"
},
"engines": {
"node": ">=4.5.0 <5.0.0 || >=5.10.0"
"node": ">=18"
},
"scripts": {
"lint": "eslint",
"lint:fix": "eslint --fix",
"test": "mocha --reporter spec --check-leaks --grep .",
"test:ci": "nyc --exclude test --reporter=lcovonly --reporter=text npm test",
"test:cov": "nyc --exclude test --reporter=html --reporter=text npm test",
"test:node-web": "ICONV_BACKEND=web mocha --grep '#node-web'",
"test:node-web": "mocha --grep '#node-web'",
"test:performance": "node --allow-natives-syntax performance/index.js",
"test:tap": "mocha --reporter tap --check-leaks --grep .",
"test:webpack": "npm pack && mv iconv-lite-*.tgz test/webpack/iconv-lite.tgz && cd test/webpack && npm install && npm run test && rm iconv-lite.tgz"
Expand Down
9 changes: 8 additions & 1 deletion test/webpack/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,14 @@ module.exports = function (config) {

// start these browsers
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
browsers: ["ChromeHeadless"],
browsers: ["ChromeHeadless", "ChromeHeadlessCI"],

customLaunchers: {
ChromeHeadlessCI: {
base: "ChromeHeadless",
flags: ["--no-sandbox"]
}
},
Comment on lines +62 to +69
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At some point when I did the rebase, I accidentally copied the original file from the next branch and didn’t fix it.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Has this change something to do with dropping the support? Else please remove it.


// Continuous Integration mode
// if true, Karma captures browsers, runs the tests and exits
Expand Down
3 changes: 2 additions & 1 deletion test/webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"karma-webpack": "^4.0.2",
"mocha": "^7.2.0",
"puppeteer": "^4.0.0",
"webpack": "^4.43.0"
"webpack": "^4.43.0",
"unorm": "^1.6.0"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Has this change something to do with dropping the support for node <18?

},
"dependencies": {
"iconv-lite": "file:iconv-lite.tgz"
Expand Down
Loading