From c864d2f3ec00608ddf4af1c19bf6a5b452d53127 Mon Sep 17 00:00:00 2001
From: loveprit-1 <loveprit.singh@falconx.io>
Date: Mon, 31 Mar 2025 11:13:59 +0530
Subject: [PATCH 1/4] Update tests.yaml

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

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index e7a5656..f8fd81e 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -2,6 +2,8 @@ name: E2E Tests for Astro Deploy Action
 
 on:
   push:
+    paths:
+      - e2e/lint_yaml.yaml
 
 env:
   ASTRO_API_TOKEN: ${{ secrets.ASTRO_API_TOKEN }}

From 91541d67737be1718cbee1d353cc4376d4b2c2aa Mon Sep 17 00:00:00 2001
From: loveprit-1 <loveprit.singh@falconx.io>
Date: Tue, 1 Apr 2025 09:35:42 +0530
Subject: [PATCH 2/4] Update action.yaml

---
 action.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yaml b/action.yaml
index f88839f..52f7c12 100644
--- a/action.yaml
+++ b/action.yaml
@@ -107,7 +107,7 @@ runs:
   using: "composite"
   steps:
     - name: checkout repo
-      uses: actions/checkout@v4
+      uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5
       if: inputs.checkout == 'true'
       with:
         fetch-depth: 0 # Fetch all history

From ddcb8134b472aaa2ab8905ff6119e315e9237cd4 Mon Sep 17 00:00:00 2001
From: vasudev <vasudev.paloju@falconx.io>
Date: Mon, 25 May 2026 19:02:39 +0530
Subject: [PATCH 3/4] Append --workspace-id to astro deploy commands for org
 tokens.

Organization API tokens require an explicit workspace on deploy; pass
--workspace-id from the workspace input and restore E2E workflow triggers.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .github/workflows/tests.yaml |  5 ++++-
 action.yaml                  | 10 ++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index f8fd81e..1398a12 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -2,8 +2,11 @@ name: E2E Tests for Astro Deploy Action
 
 on:
   push:
+    branches: [main]
     paths:
-      - e2e/lint_yaml.yaml
+      - action.yaml
+      - .github/workflows/tests.yaml
+  workflow_dispatch:
 
 env:
   ASTRO_API_TOKEN: ${{ secrets.ASTRO_API_TOKEN }}
diff --git a/action.yaml b/action.yaml
index 52f7c12..613481c 100644
--- a/action.yaml
+++ b/action.yaml
@@ -347,6 +347,11 @@ runs:
           if [[ "${{ inputs.description }}" != "" ]]; then
             options="$options --description '${{ inputs.description }}'"
           fi
+
+          # Add workspace-id option for organization API tokens
+          if [[ "${{ inputs.workspace }}" != "" ]]; then
+            options="$options --workspace-id ${{ inputs.workspace }}"
+          fi
         fi
 
         echo "DBT_DEPLOY=$DBT_DEPLOY" >> $GITHUB_OUTPUT
@@ -475,6 +480,11 @@ runs:
           options="$options --build-secrets '${{ inputs.build-secrets }}'"
         fi
 
+        # Add workspace-id option for organization API tokens
+        if [[ "${{ inputs.workspace }}" != '' ]]; then
+          options="$options --workspace-id ${{ inputs.workspace }}"
+        fi
+
         echo "OPTIONS=$options" >> $GITHUB_OUTPUT
         echo ::endgroup::
       shell: bash

From 037fce7d5350118ce68d861e1e98cd7a4f3b6234 Mon Sep 17 00:00:00 2001
From: vasudev <vasudev.paloju@falconx.io>
Date: Mon, 25 May 2026 20:12:10 +0530
Subject: [PATCH 4/4] undo tests.yml

---
 .github/workflows/tests.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 2c1de0a..5a5e7ff 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -2,10 +2,6 @@ name: E2E Tests for Astro Deploy Action
 
 on:
   push:
-    branches: [main]
-    paths:
-      - action.yaml
-      - .github/workflows/tests.yaml
   workflow_dispatch:
     inputs:
       cli_version: