Skip to content

Commit 3685a18

Browse files
committed
Fix workflow and makefile
1 parent 149228c commit 3685a18

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

.github/workflows/main.yml

-8
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ jobs:
1515
runs-on: ubuntu-latest
1616
if: startsWith(github.ref, 'refs/tags/')
1717
steps:
18-
- name: Setup nodejs
19-
uses: actions/setup-node@v4
20-
with:
21-
node-version: 22
2218
- name: Clone repository
2319
uses: actions/checkout@v4
2420
with:
@@ -34,9 +30,6 @@ jobs:
3430
tools/make-chromium.sh ${{ env.VERSION }}
3531
tools/make-firefox.sh ${{ env.VERSION }}
3632
tools/make-thunderbird.sh ${{ env.VERSION }}
37-
- name: Build NPM package
38-
run: |
39-
tools/make-npm.sh ${{ env.VERSION }}
4033
- name: Assemble release notes
4134
run: |
4235
> release.body.txt
@@ -57,4 +50,3 @@ jobs:
5750
dist/build/uBlock0_${{ env.VERSION }}.chromium.zip
5851
dist/build/uBlock0_${{ env.VERSION }}.firefox.xpi
5952
dist/build/uBlock0_${{ env.VERSION }}.thunderbird.xpi
60-
dist/build/uBlock0_${{ env.VERSION }}.npm.tgz

Makefile

+4-2
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,11 @@ dist/build/uBlock0.npm: tools/make-nodejs.sh $(sources) $(platform) $(assets)
3333
tools/make-npm.sh
3434

3535
# Dev tools
36-
npm: node_modules/
36+
node_modules:
3737
npm install
3838

39+
npm: node_modules
40+
3941
lint: npm
4042
npm run lint
4143

@@ -77,7 +79,7 @@ dist/build/uAssets:
7779
tools/pull-assets.sh
7880

7981
clean:
80-
rm -rf dist/build tmp/node_modules
82+
rm -rf dist/build tmp/node_modules node_modules
8183

8284
cleanassets:
8385
rm -rf dist/build/mv3-data dist/build/uAssets

0 commit comments

Comments
 (0)