diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 03c128df464a1..90ebc5e554fb8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,10 +15,6 @@ jobs: runs-on: ubuntu-latest if: startsWith(github.ref, 'refs/tags/') steps: - - name: Setup nodejs - uses: actions/setup-node@v4 - with: - node-version: 22 - name: Clone repository uses: actions/checkout@v4 with: @@ -34,9 +30,6 @@ jobs: tools/make-chromium.sh ${{ env.VERSION }} tools/make-firefox.sh ${{ env.VERSION }} tools/make-thunderbird.sh ${{ env.VERSION }} - - name: Build NPM package - run: | - tools/make-npm.sh ${{ env.VERSION }} - name: Assemble release notes run: | > release.body.txt @@ -57,4 +50,3 @@ jobs: dist/build/uBlock0_${{ env.VERSION }}.chromium.zip dist/build/uBlock0_${{ env.VERSION }}.firefox.xpi dist/build/uBlock0_${{ env.VERSION }}.thunderbird.xpi - dist/build/uBlock0_${{ env.VERSION }}.npm.tgz diff --git a/Makefile b/Makefile index 0ff5e3306c8cd..53075785fd5d0 100644 --- a/Makefile +++ b/Makefile @@ -33,9 +33,11 @@ dist/build/uBlock0.npm: tools/make-nodejs.sh $(sources) $(platform) $(assets) tools/make-npm.sh # Dev tools -npm: node_modules/ +node_modules: npm install +npm: node_modules + lint: npm npm run lint @@ -77,7 +79,7 @@ dist/build/uAssets: tools/pull-assets.sh clean: - rm -rf dist/build tmp/node_modules + rm -rf dist/build tmp/node_modules node_modules cleanassets: rm -rf dist/build/mv3-data dist/build/uAssets