NPM CI (#921)

Enable automatic development npm deployments on merge to main.

.npmrc

@@ -0,0 +1 @@
+//registry.npmjs.org/:_authToken=${NPM_TOKEN}

cloudbuild/deploy/cloudbuild.yaml

@@ -1,19 +1,16 @@
 steps:
-  - id: deploy-marketplace
+  - id: deploy-npm
     name: "nixos/nix"
     entrypoint: sh
     args:
       - -c
       - "./cloudbuild/deploy/$TRIGGER_NAME.sh"
     timeout: "1600s"
-    secretEnv: ["VSCE_PAT", "GA_API_SECRET", "GA_MEASUREMENT_ID"]
-logsBucket: "gs://malloy-cloudbuild-logs"
-timeout: "1600s"
+    secretEnv: ["NPM_TOKEN"]
+options:
+  logging: CLOUD_LOGGING_ONLY
+timeout: "1800s"
 availableSecrets:
   secretManager:
-    - versionName: projects/malloy-303216/secrets/marketplace-prerelease-CI/versions/latest
-      env: "VSCE_PAT"
-    - versionName: projects/malloy-303216/secrets/vscode-extension-CI-GA-API-SECRET/versions/latest
-      env: "GA_API_SECRET"
-    - versionName: projects/malloy-303216/secrets/vscode-extension-CI-GA-MEASUREMENT-ID/versions/latest
-      env: "GA_MEASUREMENT_ID"
+    - versionName: projects/malloy-303216/secrets/npm-publish/versions/latest
+      env: "NPM_TOKEN"

cloudbuild/deploy/malloy-npm-publish.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+set -euxo pipefail
+
+export PACKAGES="packages/malloy packages/malloy-db-bigquery packages/malloy-db-duckdb packages/malloy-db-postgres packages/malloy-render"
+
+nix-shell --pure --keep NPM_TOKEN --keep PACKAGES --command "$(cat <<NIXCMD
+  set -euxo pipefail
+  cd /workspace
+  npm --no-audit --no-fund ci --loglevel error
+  npm run build
+  echo Publishing \$PACKAGES
+  PRERELEASE=\$(date +%y%m%d%H%M%S)
+  for package in \$PACKAGES; do
+    VERSION=\$(jq -r .version \$package/package.json)
+    echo Publishing \$package \$VERSION-\$PRERELEASE
+    npm version -w \$package \$VERSION-\$PRERELEASE
+    npm publish -w \$package --tag next
+  done
+NIXCMD
+)"

default.nix

@@ -1 +1 @@
-with import <nixpkgs> {}; stdenv.mkDerivation { name = "malloy"; buildInputs = [ nodejs-16_x jdk8 google-cloud-sdk postgresql ruby.devEnv git fakeroot]; }
+with import <nixpkgs> {}; stdenv.mkDerivation { name = "malloy"; buildInputs = [ nodejs-16_x jdk8 google-cloud-sdk postgresql ruby.devEnv git jq fakeroot]; }

package.json

@@ -38,9 +38,9 @@
   },
   "devDependencies": {
     "@jest/globals": "^26.6.2",
-    "@malloydata/db-bigquery": "0.0.5",
-    "@malloydata/malloy": "0.0.5",
-    "@malloydata/render": "0.0.5",
+    "@malloydata/db-bigquery": "0.0.6",
+    "@malloydata/malloy": "0.0.6",
+    "@malloydata/render": "0.0.6",
     "@types/archiver": "^5.3.1",
     "@types/fs-extra": "^9.0.13",
     "@types/jest-expect-message": "^1.0.3",

packages/malloy-db-bigquery/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-bigquery",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "license": "GPL-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -20,7 +20,7 @@
   "dependencies": {
     "@google-cloud/bigquery": "^5.5.0",
     "@google-cloud/common": "^3.6.0",
-    "@malloydata/malloy": "^0.0.5",
+    "@malloydata/malloy": "0.0.6",
     "gaxios": "^4.2.0"
   }
 }

packages/malloy-db-duckdb/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-duckdb",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "license": "GPL-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@duckdb/duckdb-wasm": "^1.17.0",
-    "@malloydata/malloy": "^0.0.5",
+    "@malloydata/malloy": "0.0.6",
     "duckdb": "0.5.1"
   }
 }

packages/malloy-db-postgres/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-postgres",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "license": "GPL-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,7 +18,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/malloy": "^0.0.5",
+    "@malloydata/malloy": "0.0.6",
     "@types/pg": "^8.6.1",
     "pg": "^8.7.1",
     "pg-query-stream": "4.2.3"

packages/malloy-render/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/render",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "license": "GPL-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -17,7 +17,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/malloy": "^0.0.5",
+    "@malloydata/malloy": "0.0.6",
     "us-atlas": "^3.0.0",
     "vega": "^5.21.0",
     "vega-lite": "^5.2.0"

packages/malloy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "license": "GPL-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

test/package.json

@@ -9,9 +9,9 @@
     "malloyc": "ts-node ../scripts/malloy-to-json"
   },
   "dependencies": {
-    "@malloydata/malloy": "0.0.5",
-    "@malloydata/db-bigquery": "0.0.5",
-    "@malloydata/db-postgres": "0.0.5",
-    "@malloydata/db-duckdb": "0.0.5"
+    "@malloydata/malloy": "0.0.6",
+    "@malloydata/db-bigquery": "0.0.6",
+    "@malloydata/db-postgres": "0.0.6",
+    "@malloydata/db-duckdb": "0.0.6"
   }
 }