duckdb 0.10.1-dev0.0 → 0.10.1-dev13.0

package/.github/workflows/NodeJS.yml

@@ -11,8 +11,9 @@ concurrency:
 
 env:
   GH_TOKEN: ${{ secrets.GH_TOKEN }}
-  AWS_ACCESS_KEY_ID: ${{ secrets.NODE_PRE_GYP_ID }}
-  AWS_SECRET_ACCESS_KEY: ${{ secrets.NODE_PRE_GYP_SECRETACCESSKEY }}
+  AWS_ACCESS_KEY_ID: ${{secrets.S3_DUCKDB_ORG_DEPLOY_ID}}
+  AWS_SECRET_ACCESS_KEY: ${{secrets.S3_DUCKDB_ORG_DEPLOY_KEY}}
+  AWS_DEFAULT_REGION: us-east-1
 
 jobs:
   set-up-npm:
@@ -25,6 +26,24 @@ jobs:
         with:
           fetch-depth: 0
 
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+
+      - name: Debug workflow
+        shell: bash
+        run:
+          echo "$AWS_ACCESS_KEY_ID" "$AWS_DEFAULT_REGION"
+          echo "$AWS_ACCESS_KEY_ID" > myfile.txt
+          LOCAL_BINARY=myfile.txt
+          REMOTE_BINARY=https://npm.duckdb.org/duckdb/myfile.txt
+          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"
+          aws s3 cp $LOCAL_BINARY $S3_ENDPOINT_BINARY --acl public-read
+
       - name: Setup NPM
         shell: bash
         run: ./scripts/node_version.sh upload
@@ -43,7 +62,7 @@ jobs:
     strategy:
       matrix:
         # node.js current support policy to be found at https://github.com/duckdb/duckdb-node/tree/main/#Supported-Node-versions
-        node: [ '12', '14', '16', '17', '18', '19', '20', '21']
+        node: [ '16', '17', '18', '19', '20', '21']
         target_arch: [ x64, arm64 ]
         isRelease:
           - ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
@@ -73,6 +92,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: |
@@ -109,7 +133,7 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' || github.repository != 'duckdb/duckdb-node'
     name: node.js OSX
     runs-on: macos-latest
-    needs: linux-nodejs
+    needs: set-up-npm
     continue-on-error: ${{ matrix.node != '18' && matrix.node != '20' && matrix.node != '21' }}
     strategy:
       matrix:
@@ -172,14 +196,14 @@ jobs:
   win-nodejs:
     name: node.js Windows
     runs-on: windows-latest
-    needs: linux-nodejs
+    needs: set-up-npm
     continue-on-error: ${{ matrix.node != '18' && matrix.node != '20' && matrix.node != '21' }}
     env:
       npm_config_msvs_version: 2019
 
     strategy:
       matrix:
-        node: [ '12', '14', '16', '17', '18', '19', '20', '21']
+        node: [ '16', '17', '18', '19', '20', '21']
         isRelease:
           - ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
         exclude:
@@ -199,9 +223,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:

package/myfile.txt

@@ -0,0 +1 @@
+AKIA4HHCC5ZJWPMXCW75 us-east-1 echo AKIA4HHCC5ZJWPMXCW75 LOCAL_BINARY=myfile.txt REMOTE_BINARY=https://npm.duckdb.org/duckdb/myfile.txt S3_ENDPOINT_BINARY=s3://duckdb-npm/ pip install awscli echo local binary at   echo remote binary at  echo served from       aws s3 cp --acl public-read

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-dev13.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