Skip to content

Commit f30d891

Browse files
authoredJan 23, 2025··
chore: update makefile to use latest npm version and upgrade packages (#86)
1 parent 7813a32 commit f30d891

File tree

3 files changed

+349
-493
lines changed

3 files changed

+349
-493
lines changed
 

‎.github/workflows/push.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
triplet: x64-osx-10.13
2020
steps:
2121
- uses: actions/checkout@master
22-
- name: Use Node.js 16.x
22+
- name: Use Node.js 22.x
2323
uses: actions/setup-node@v1
2424
with:
25-
node-version: 16.x
25+
node-version: 22.x
2626
- name: npm install
2727
run: npm install
2828
- name: make test
@@ -31,10 +31,10 @@ jobs:
3131
runs-on: ubuntu-latest
3232
steps:
3333
- uses: actions/checkout@master
34-
- name: Use Node.js 16.x
34+
- name: Use Node.js 22.x
3535
uses: actions/setup-node@v1
3636
with:
37-
node-version: 16.x
37+
node-version: 22.x
3838
- name: npm install
3939
run: npm install
4040
- name: make lint
@@ -44,10 +44,10 @@ jobs:
4444
runs-on: ubuntu-latest
4545
steps:
4646
- uses: actions/checkout@master
47-
- name: Use Node.js 16.x
47+
- name: Use Node.js 22.x
4848
uses: actions/setup-node@v1
4949
with:
50-
node-version: 16.x
50+
node-version: 22.x
5151
- name: npm install
5252
run: npm install
5353
- name: make e2e
@@ -58,10 +58,10 @@ jobs:
5858
needs: ['markdown-test', 'lint', 'test']
5959
steps:
6060
- uses: actions/checkout@master
61-
- name: Use Node.js 16.x
61+
- name: Use Node.js 22.x
6262
uses: actions/setup-node@v1
6363
with:
64-
node-version: 16.x
64+
node-version: 22.x
6565
- name: npm install
6666
run: npm install
6767
- name: Publish

‎Makefile

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ export PATH := $(shell npm bin):$(PATH)
22

33
build:
44
rm -rf dist || true
5-
$(shell npm bin)/tsc -p tsconfig.json
6-
$(shell npm bin)/tsc -p test/tsconfig.json
5+
$(shell npm root)/.bin/tsc -p tsconfig.json
6+
$(shell npm root)/.bin/tsc -p test/tsconfig.json
77
chmod +x dist/bin.js
88
node dist/utils/packStdLib.js
99

@@ -20,10 +20,10 @@ test: | build just-test
2020

2121
xml-test:
2222
MOCHA_FILE=./test/TEST-RESULTS.xml \
23-
$(shell npm bin)/mocha --reporter mocha-junit-reporter
23+
$(shell npm root)/.bin/mocha --reporter mocha-junit-reporter
2424

2525
coverage:
26-
$(shell npm bin)/nyc ./node_modules/mocha/bin/_mocha
26+
$(shell npm root)/.bin/nyc ./node_modules/mocha/bin/_mocha
2727

2828
ci-test: | lint test e2e
2929

@@ -33,19 +33,19 @@ inspect: build
3333
node --inspect ./node_modules/mocha/bin/_mocha --require source-map-support/register test/*.spec.js
3434

3535
watch: build
36-
$(shell npm bin)/tsc -p tsconfig.json --watch & $(shell npm bin)/tsc -p test/tsconfig.json --watch
36+
$(shell npm root)/.bin/tsc -p tsconfig.json --watch & $(shell npm root)/.bin/tsc -p test/tsconfig.json --watch
3737

3838
lint:
3939
echo "true"
40-
# $(shell npm bin)/tslint src/**/*.ts --project tsconfig.json
40+
# $(shell npm root)/.bin/tslint src/**/*.ts --project tsconfig.json
4141

4242
e2e:
4343
$(MAKE) md-tests
4444
cd test/fixtures/cli/smoke && ../../../../dist/bin.js main.lys --test --debug --wast
4545
cd test/fixtures/cli/custom-lib && ../../../../dist/bin.js main.lys --test --debug --wast --lib lib.js
4646

4747
md-tests: build
48-
$(shell npm bin)/ts-node test/RunModulesFolder.ts
48+
$(shell npm root)/.bin/ts-node test/RunModulesFolder.ts
4949

5050
snapshot: export UPDATE_AST=true
5151
snapshot: just-test

‎package-lock.json

+334-478
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
Please sign in to comment.