From 421405ea5779a72e598909fc7565ca3205c1224f Mon Sep 17 00:00:00 2001
From: Tanner Stirrat <tstirrat@gmail.com>
Date: Wed, 2 Oct 2024 15:42:57 -0600
Subject: [PATCH 1/3] Remove unnecessary filter

---
 .github/workflows/test.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 0aba047..6f76456 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -34,7 +34,7 @@ jobs:
         node-version: [18, 20, 21]
     needs: "paths-filter"
     if: |
-      needs.paths-filter.outputs.codechange == 'true' || github.event_name == 'release'
+      needs.paths-filter.outputs.codechange == 'true'
     steps:
       - uses: actions/checkout@v4
       - uses: "authzed/action-spicedb@v1"
@@ -57,7 +57,7 @@ jobs:
         node-version: [18, 20, 21]
     needs: "paths-filter"
     if: |
-      needs.paths-filter.outputs.codechange == 'true' || github.event_name == 'release'
+      needs.paths-filter.outputs.codechange == 'true'
     steps:
       - uses: actions/checkout@v4
       - uses: "authzed/action-spicedb@v1"

From 1d30359f7c38b45b4958898d329a885d1a77e9b3 Mon Sep 17 00:00:00 2001
From: Tanner Stirrat <tstirrat@gmail.com>
Date: Wed, 2 Oct 2024 15:43:31 -0600
Subject: [PATCH 2/3] Remove dependencies that are no longer present; add build
 steps to publish

---
 .github/workflows/publish.yaml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index e1eae32..24bc787 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -8,8 +8,6 @@ on:  # yamllint disable-line rule:truthy
 jobs:
   publish:
     name: Publish to NPM
-    needs:
-      - test
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -29,22 +27,28 @@ jobs:
   # NOTE: this publishes an alternate version that doesn't depend on protobuf-ts/runtime
   publish-js-client:
     name: Publish JS client to NPM
-    needs: build-js-client
     runs-on: ubuntu-latest
     steps:
-      - name: Download js client build
-        uses: actions/download-artifact@v4
-        with:
-          name: js-client-18
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
           node-version: 18
+          cache: "yarn"
+      # Install deps in base package and build into js-dist
       - uses: bahmutov/npm-install@v1
+      - name: Run build
+        run: yarn build-js-client
+      - uses: bahmutov/npm-install@v1
+        with:
+          working-directory: ./js-dist
       - uses: battila7/get-version-action@v2
       # Set the version in package.json to match the tag
       - run: "npm version ${{ steps.get_version.outputs.version-without-v }}"
+        working-directory: ./js-dist
       - uses: JS-DevTools/npm-publish@v3
         with:
           token: ${{ secrets.NPM_TOKEN }}
           tag: ${{ steps.get_version.outputs.version }}
+          # Point at the js-dist directory as the working directory
+          package: js-dist
           access: public

From 52bc0adc5b9b06572fbf0e700168becec206c8e3 Mon Sep 17 00:00:00 2001
From: Tanner Stirrat <tstirrat@gmail.com>
Date: Thu, 3 Oct 2024 10:34:23 -0600
Subject: [PATCH 3/3] Remove merge group to see if it fixes issue where checks
 aren't run

---
 .github/workflows/test.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 6f76456..3d049b1 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -6,9 +6,6 @@ on:
   pull_request:
     branches:
       - "*"
-  merge_group:
-    types:
-      - "checks_requested"
 jobs:
   paths-filter:
     runs-on: "buildjet-2vcpu-ubuntu-2204"