From 8121e05bc712a4e8b5320d81f51e54de40a54fe0 Mon Sep 17 00:00:00 2001
From: Alexander Wang <alex@terrastruct.com>
Date: Mon, 24 Mar 2025 11:51:46 -0600
Subject: [PATCH 1/2] [ci-force] run npm-nightly first, serially

---
 .github/workflows/daily.yml | 39 ++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
index 6805b3b99..3833fe1da 100644
--- a/.github/workflows/daily.yml
+++ b/.github/workflows/daily.yml
@@ -8,23 +8,6 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  ci:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
-        with:
-          go-version-file: ./go.mod
-          cache: true
-      - run: COLOR=1 CI_FORCE=1 ./make.sh all race
-        env:
-          GITHUB_TOKEN: ${{ secrets._GITHUB_TOKEN }}
-          DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
-      - uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: d2chaos
-          path: ./d2chaos/out
   npm-nightly:
     runs-on: ubuntu-latest
     steps:
@@ -51,10 +34,26 @@ jobs:
 
       - name: Publish nightly version to NPM
         if: steps.check_changes.outputs.has_changes == 'true'
-        run: |
-          export NPM_VERSION=nightly
-          COLOR=1 ./make.sh js
+        run: COLOR=1 NPM_VERSION=nightly ./make.sh js
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
           GITHUB_TOKEN: ${{ secrets._GITHUB_TOKEN }}
           DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
+  ci:
+    needs: [npm-nightly]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with:
+          go-version-file: ./go.mod
+          cache: true
+      - run: COLOR=1 CI_FORCE=1 ./make.sh all race
+        env:
+          GITHUB_TOKEN: ${{ secrets._GITHUB_TOKEN }}
+          DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
+      - uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: d2chaos
+          path: ./d2chaos/out

From 2d922b67e3f48f297bc5b8f65bad25d0fa454e3f Mon Sep 17 00:00:00 2001
From: Alexander Wang <alex@terrastruct.com>
Date: Mon, 24 Mar 2025 11:57:39 -0600
Subject: [PATCH 2/2] add debug logs

---
 .github/workflows/daily.yml | 7 ++++++-
 Makefile                    | 3 ++-
 d2js/js/ci/build.sh         | 1 +
 d2js/js/make.sh             | 1 +
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
index 3833fe1da..eff6ad80c 100644
--- a/.github/workflows/daily.yml
+++ b/.github/workflows/daily.yml
@@ -34,7 +34,12 @@ jobs:
 
       - name: Publish nightly version to NPM
         if: steps.check_changes.outputs.has_changes == 'true'
-        run: COLOR=1 NPM_VERSION=nightly ./make.sh js
+        run: |
+          echo "Debug: About to set NPM_VERSION=nightly"
+          export NPM_VERSION=nightly
+          env | grep NPM_ || echo "No NPM variables found!"
+          echo "Debug: Running make.sh with NPM_VERSION=$NPM_VERSION"
+          COLOR=1 ./make.sh js
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
           GITHUB_TOKEN: ${{ secrets._GITHUB_TOKEN }}
diff --git a/Makefile b/Makefile
index 37cf33c18..eace103df 100644
--- a/Makefile
+++ b/Makefile
@@ -23,4 +23,5 @@ race: fmt
 	prefix "$@" ./ci/test.sh --race ./...
 .PHONY: js
 js: gen
-	cd d2js/js && prefix "$@" ./make.sh all
+	echo "DEBUG: Root Makefile NPM_VERSION=${NPM_VERSION:-not set}"
+	cd d2js/js && NPM_VERSION="${NPM_VERSION}" prefix "$@" ./make.sh all
diff --git a/d2js/js/ci/build.sh b/d2js/js/ci/build.sh
index 87a692196..00948fb9c 100755
--- a/d2js/js/ci/build.sh
+++ b/d2js/js/ci/build.sh
@@ -18,6 +18,7 @@ fi
 cd d2js/js
 sh_c bun build.js
 
+echo "DEBUG: build.sh received NPM_VERSION=${NPM_VERSION:-not set}"
 if [ -n "${NPM_VERSION:-}" ]; then
   cp package.json package.json.bak
   trap 'rm -f .npmrc; mv package.json.bak package.json' EXIT
diff --git a/d2js/js/make.sh b/d2js/js/make.sh
index 318dff2e0..d6f508cba 100755
--- a/d2js/js/make.sh
+++ b/d2js/js/make.sh
@@ -9,6 +9,7 @@ fi
 PATH="$(cd -- "$(dirname "$0")" && pwd)/../../ci/sub/bin:$PATH"
 cd -- "$(dirname "$0")"
 
+echo "DEBUG: d2js/js/make.sh received NPM_VERSION=${NPM_VERSION:-not set}"
 if ! command -v bun >/dev/null 2>&1; then
   if [ -n "${CI-}" ]; then
     echo "Bun is not installed. Installing Bun..."