3.2.4

null8626 · Aug 4, 2024 · 0555aed · 0555aed
1 parent 7f9a205
commit 0555aed
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 95 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -498,50 +498,50 @@ jobs:
           name: node-${{ matrix.settings.target }}
           path: decancer.*.node
           if-no-files-found: error
-  node-freebsd:
-    runs-on: macos-12
-    needs:
-      - setup
-      - core
-    if: ${{ always() && (needs.setup.outputs.release != 'null' || needs.setup.outputs.node_affected == 'true') }}
-    name: Build node bindings on FreeBSD
-    steps:
-      - uses: actions/checkout@v4
-      - name: Build
-        id: build
-        uses: cross-platform-actions/action@v0.23.0
-        timeout-minutes: 30
-        env:
-          DEBUG: napi:*
-          RUSTUP_IO_THREADS: 1
-        with:
-          operating_system: freebsd
-          version: '13.2'
-          memory: 8G
-          cpu_count: 3
-          environment_variables: DEBUG RUSTUP_IO_THREADS
-          shell: bash
-          run: |
-            sudo pkg install -y -f curl node libnghttp2 npm
-            sudo npm install -g yarn --ignore-scripts
-            curl https://sh.rustup.rs -sSf --output rustup.sh
-            sh rustup.sh -y --profile minimal --default-toolchain stable
-            source "$HOME/.cargo/env"
-            cd ./bindings/node
-            yarn install
-            yarn build
-            strip -x *.node
-            mv ./decancer.freebsd-x64.node ../..
-            rm -rf node_modules
-            rm -rf target
-            rm -rf .yarn/cache
-      - name: Upload artifact
-        if: ${{ needs.setup.outputs.release != 'null' }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: node-freebsd-x64
-          path: decancer.freebsd-x64.node
-          if-no-files-found: error
+  #node-freebsd:
+  #  runs-on: macos-12
+  #  needs:
+  #    - setup
+  #    - core
+  #  if: ${{ always() && (needs.setup.outputs.release != 'null' || needs.setup.outputs.node_affected == 'true') }}
+  #  name: Build node bindings on FreeBSD
+  #  steps:
+  #    - uses: actions/checkout@v4
+  #    - name: Build
+  #      id: build
+  #      uses: cross-platform-actions/action@v0.23.0
+  #      timeout-minutes: 30
+  #      env:
+  #        DEBUG: napi:*
+  #        RUSTUP_IO_THREADS: 1
+  #      with:
+  #        operating_system: freebsd
+  #        version: '13.2'
+  #        memory: 8G
+  #        cpu_count: 3
+  #        environment_variables: DEBUG RUSTUP_IO_THREADS
+  #        shell: bash
+  #        run: |
+  #          sudo pkg install -y -f curl node libnghttp2 npm
+  #          sudo npm install -g yarn --ignore-scripts
+  #          curl https://sh.rustup.rs -sSf --output rustup.sh
+  #          sh rustup.sh -y --profile minimal --default-toolchain stable
+  #          source "$HOME/.cargo/env"
+  #          cd ./bindings/node
+  #          yarn install
+  #          yarn build
+  #          strip -x *.node
+  #          mv ./decancer.freebsd-x64.node ../..
+  #          rm -rf node_modules
+  #          rm -rf target
+  #          rm -rf .yarn/cache
+  #    - name: Upload artifact
+  #      if: ${{ needs.setup.outputs.release != 'null' }}
+  #      uses: actions/upload-artifact@v4
+  #      with:
+  #        name: node-freebsd-x64
+  #        path: decancer.freebsd-x64.node
+  #        if-no-files-found: error
   node-test:
     name: Test node bindings
     needs:
@@ -774,7 +774,7 @@ jobs:
     needs:
       - setup
       - node-test
-      - node-freebsd
+      #- node-freebsd
       - native-test
       - commit
       - pages

diff --git a/bindings/node/npm/freebsd-x64/README.md b/bindings/node/npm/freebsd-x64/README.md
diff --git a/bindings/node/npm/freebsd-x64/package.json b/bindings/node/npm/freebsd-x64/package.json
diff --git a/bindings/node/package.json b/bindings/node/package.json
@@ -50,8 +50,7 @@
         "armv7-unknown-linux-gnueabihf",
         "x86_64-unknown-linux-musl",
         "i686-pc-windows-msvc",
-        "armv7-linux-androideabi",
-        "x86_64-unknown-freebsd"
+        "armv7-linux-androideabi"
       ]
     }
   },

diff --git a/scripts/ci_artifacts.mjs b/scripts/ci_artifacts.mjs
@@ -62,8 +62,7 @@ const expectedNodeTargets = [
   'aarch64-linux-android',
   'armv7-linux-androideabi',
   'aarch64-unknown-linux-musl',
-  'aarch64-pc-windows-msvc',
-  'freebsd-x64'
+  'aarch64-pc-windows-msvc' //, 'freebsd-x64'
 ]
 
 let foundJavaJar = false
@@ -102,17 +101,13 @@ void (await Promise.all(
         join(ARTIFACTS_DIR, artifact, 'decancer.jar'),
         join(ROOT_DIR, 'decancer.jar')
       )
-
+      
       foundJavaJar = true
     }
   })
 ))
 
-if (
-  expectedNativeTargets.length !== 0 ||
-  expectedNodeTargets.length !== 0 ||
-  !foundJavaJar
-) {
+if (expectedNativeTargets.length !== 0 || expectedNodeTargets.length !== 0 || !foundJavaJar) {
   console.error('error: found missing targets. exiting.')
   process.exit(1)
 }