duckdb 0.10.1-dev0.0 → 0.10.1-dev6.0

package/.github/workflows/NodeJS.yml

@@ -73,6 +73,11 @@ jobs:
         with:
           fetch-depth: 0
 
+      # Default Python (3.12) doesn't have support for distutils
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+
       - name: Update apt
         shell: bash
         run: |
@@ -102,6 +107,10 @@ jobs:
           npm_config_yes: true
 
       - name: Node ${{ matrix.node }}
+        env:
+          AWS_ACCESS_KEY_ID: ${{secrets.S3_ID}}
+          AWS_SECRET_ACCESS_KEY: ${{secrets.S3_KEY}}
+          AWS_DEFAULT_REGION: us-east-1
         shell: bash
         run: ./scripts/node_build.sh ${{ matrix.node }}
 
@@ -166,6 +175,10 @@ jobs:
           NODE_AUTH_TOKEN: ${{secrets.NODE_AUTH_TOKEN}}
 
       - name: Node ${{ matrix.node }}
+        env:
+          AWS_ACCESS_KEY_ID: ${{secrets.S3_ID}}
+          AWS_SECRET_ACCESS_KEY: ${{secrets.S3_KEY}}
+          AWS_DEFAULT_REGION: us-east-1
         shell: bash
         run: ./scripts/node_build.sh ${{ matrix.node }}
 
@@ -199,9 +212,10 @@ jobs:
             node: 20
 
     steps:
+      # Default Python (3.12) doesn't have support for distutils
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.8'
+          python-version: '3.11'
 
       - uses: actions/checkout@v3
         with:
@@ -238,5 +252,9 @@ jobs:
           variant: sccache
 
       - name: Node
+        env:
+          AWS_ACCESS_KEY_ID: ${{secrets.S3_ID}}
+          AWS_SECRET_ACCESS_KEY: ${{secrets.S3_KEY}}
+          AWS_DEFAULT_REGION: us-east-1
         shell: bash
         run: ./scripts/node_build_win.sh

package/package.json

@@ -2,7 +2,7 @@
   "name": "duckdb",
   "main": "./lib/duckdb.js",
   "types": "./lib/duckdb.d.ts",
-  "version": "0.10.1-dev0.0",
+  "version": "0.10.1-dev6.0",
   "description": "DuckDB node.js API",
   "gypfile": true,
   "dependencies": {
@@ -13,7 +13,7 @@
   "binary": {
     "module_name": "duckdb",
     "module_path": "./lib/binding/",
-    "host": "https://duckdb-node.s3.amazonaws.com"
+    "host": "https://npm.duckdb.org/duckdb"
   },
   "scripts": {
     "install": "node-pre-gyp install --fallback-to-build",

package/scripts/node_build.sh

@@ -34,7 +34,19 @@ fi
 
 export PATH=$(npm bin):$PATH
 ./node_modules/.bin/node-pre-gyp package testpackage testbinary --target_arch="$TARGET_ARCH"
+
+LOCAL_BINARY=$(./node_modules/.bin/node-pre-gyp reveal staged_tarball --silent --target_arch="$TARGET_ARCH")
+REMOTE_BINARY=$(./node_modules/.bin/node-pre-gyp reveal hosted_tarball --silent --target_arch="$TARGET_ARCH")
+S3_ENDPOINT_BINARY="s3://duckdb-npm/"${REMOTE_BINARY:23}
+
+pip install awscli
+
+echo "local binary at  $LOCAL_BINARY"
+echo "remote binary at $REMOTE_BINARY"
+echo "served from      $S3_ENDPOINT_BINARY"
+
 if [[ "$GITHUB_REF" =~ ^(refs/heads/main|refs/tags/v.+)$ ]] ; then
-  ./node_modules/.bin/node-pre-gyp publish --target_arch=$TARGET_ARCH
-  ./node_modules/.bin/node-pre-gyp info --target_arch=$TARGET_ARCH
+  aws s3 cp $LOCAL_BINARY $S3_ENDPOINT_BINARY --acl public-read
+else
+  aws s3 cp $LOCAL_BINARY $S3_ENDPOINT_BINARY --acl public-read --dryrun
 fi

package/scripts/node_build_win.sh

@@ -15,7 +15,18 @@ if [[ ! "$GITHUB_REF" =~ ^(refs/tags/v.+)$ ]] ; then
 fi
 npx node-pre-gyp package testpackage testbinary
 
+LOCAL_BINARY=$(./node_modules/.bin/node-pre-gyp reveal staged_tarball --silent)
+REMOTE_BINARY=$(./node_modules/.bin/node-pre-gyp reveal hosted_tarball --silent)
+S3_ENDPOINT_BINARY="s3://duckdb-npm/"${REMOTE_BINARY:23}
+
+pip install awscli
+
+echo "local binary at  $LOCAL_BINARY"
+echo "remote binary at $REMOTE_BINARY"
+echo "served from      $S3_ENDPOINT_BINARY"
+
 if [[ "$GITHUB_REF" =~ ^(refs/heads/main|refs/tags/v.+)$ ]] ; then
-  npx node-pre-gyp publish
-  npx node-pre-gyp info
-fi
+  aws s3 cp $LOCAL_BINARY $S3_ENDPOINT_BINARY --acl public-read
+else
+  aws s3 cp $LOCAL_BINARY $S3_ENDPOINT_BINARY --acl public-read --dryrun
+fi