fix: fix prebuild scripts

openwebf · Mar 4, 2024 · 0e9c725 · 0e9c725
1 parent c1030bc
commit 0e9c725
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 37 deletions.
diff --git a/.github/workflows/npm-publish-beta.yml b/.github/workflows/npm-publish-beta.yml
@@ -8,20 +8,33 @@ on:
     types: [created]
   workflow_dispatch:
 jobs:
-  build:
-    runs-on: ubuntu-latest
+  prebuild:
+    strategy:
+      matrix:
+        os: [windows-2022, ubuntu-latest, macos-12, macos-14]
+        node: [14]
+    runs-on: ${{ matrix.os }}
+    env:
+      VCINSTALLDIR: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC'
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 16
       - uses: actions/setup-python@v4
         with:
           python-version: '3.x'
-      - run: npm i
-      - run: npm ci
-      - run: npm test
-
+      - run: pip install setuptools
+      - uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node }}
+      - if: ${{ matrix.os == 'windows' }}
+        shell: powershell
+        run: |
+          npm config set msvs_version 2022 -g
+      - run: npm install --ignore-scripts
+      - run: npm run build -- --msvs_version=2022
+      - uses: actions/upload-artifact@v3
+        with:
+          name: qjsc-prebuild-${{ matrix.os }}-node${{ matrix.node }}
+          path: build/Release/node.napi.node
   publish-npm:
     needs: build
     runs-on: ubuntu-latest
@@ -34,6 +47,22 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: '3.x'
+      - uses: actions/download-artifact@v2
+        with:
+          name: qjsc-prebuild-windows-2022-node14
+          path: prebuilds/win32-x64/
+      - uses: actions/download-artifact@v2
+        with:
+          name: qjsc-prebuild-ubuntu-latest-node14
+          path: prebuilds/linux-x64/
+      - uses: actions/download-artifact@v2
+        with:
+          name: qjsc-prebuild-macos-12-node14
+          path: prebuilds/darwin-x64/
+      - uses: actions/download-artifact@v2
+        with:
+          name: qjsc-prebuild-macos-14-node14
+          path: prebuilds/darwin-arm64/
       - run: npm publish --tag beta
         env:
           NODE_AUTH_TOKEN: ${{secrets.npm_token}}
diff --git a/.github/workflows/prebuild.yml b/.github/workflows/prebuild.yml
@@ -4,30 +4,4 @@ on:
   workflow_dispatch:
 
 jobs:
-  prebuild:
-    strategy:
-      matrix:
-        os: [windows-2022, ubuntu-latest, macos-12, macos-14]
-        node: [16]
-    runs-on: ${{ matrix.os }}
-    env:
-      VCINSTALLDIR: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC'
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.x'
-      - run: pip install setuptools
-      - uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node }}
-      - if: ${{ matrix.os == 'windows' }}
-        shell: powershell
-        run: |
-          npm config set msvs_version 2022 -g
-      - run: npm install --ignore-scripts
-      - run: npm run build -- --msvs_version=2022
-      - uses: actions/upload-artifact@v3
-        with:
-          name: qjsc-prebuild-${{ matrix.os }}-node${{ matrix.node }}
-          path: build/Release/qjsc_20210327.node
+
diff --git a/binding.gyp b/binding.gyp
@@ -44,7 +44,7 @@
         "deps/quickjs/src/core/builtins/js-string.c",
         "deps/quickjs/src/core/builtins/js-symbol.c",
         "deps/quickjs/src/core/builtins/js-typed-array.c",
-        "deps/quickjs/src/libbf.c",
+#         "deps/quickjs/src/libbf.c",
       ],
       'include_dirs': [
         "<!(node -p \"require('node-addon-api').include_dir\")",