From 29077c88be479cf9f273eda96f9649f95bc9731f Mon Sep 17 00:00:00 2001
From: Boris Ballester <boris.ballester@typeform.com>
Date: Thu, 16 Jul 2026 08:17:21 +0200
Subject: [PATCH] fix(ci): use global install for datadog-ci and fix pnpm link
 syntax

---
 .../workflows/frontend-deploy-workflow.yml    |  2 +-
 .github/workflows/frontend-pr-workflow.yml    |  2 +-
 shared-actions/setup-jarvis/action.yml        | 29 +++++++++++++++----
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/frontend-deploy-workflow.yml b/.github/workflows/frontend-deploy-workflow.yml
index b46eea9..aa8d494 100644
--- a/.github/workflows/frontend-deploy-workflow.yml
+++ b/.github/workflows/frontend-deploy-workflow.yml
@@ -736,7 +736,7 @@ jobs:
         if: inputs.jarvis-datadog-enabled
         continue-on-error: true
         run: |
-          npx --yes @datadog/datadog-ci@5.21.0 tag --level pipeline \
+          datadog-ci tag --level pipeline \
             --tags "workflow_version:${{ env.WORKFLOW_VERSION }}" \
             --tags "workflow_file:${{ env.WORKFLOW_FILE }}"
         env:
diff --git a/.github/workflows/frontend-pr-workflow.yml b/.github/workflows/frontend-pr-workflow.yml
index e0aafb7..b72b681 100644
--- a/.github/workflows/frontend-pr-workflow.yml
+++ b/.github/workflows/frontend-pr-workflow.yml
@@ -570,7 +570,7 @@ jobs:
         if: inputs.jarvis-datadog-enabled
         continue-on-error: true
         run: |
-          npx --yes @datadog/datadog-ci@5.21.0 tag --level pipeline \
+          datadog-ci tag --level pipeline \
             --tags "workflow_version:${{ env.WORKFLOW_VERSION }}" \
             --tags "workflow_file:${{ env.WORKFLOW_FILE }}"
         env:
diff --git a/shared-actions/setup-jarvis/action.yml b/shared-actions/setup-jarvis/action.yml
index f345fdb..fe4083d 100644
--- a/shared-actions/setup-jarvis/action.yml
+++ b/shared-actions/setup-jarvis/action.yml
@@ -33,11 +33,20 @@ runs:
           echo "🔗 Linking local Jarvis from /Users/kevin.barz/code/jarvis"
           JARVIS_LOCAL="/Users/kevin.barz/code/jarvis"
           if [ -f "$JARVIS_LOCAL/pnpm-lock.yaml" ]; then
-            cd "$JARVIS_LOCAL" && pnpm link
+            cd "$JARVIS_LOCAL"
+            pnpm install --frozen-lockfile
+            pnpm link
+          else
+            cd "$JARVIS_LOCAL"
+            yarn install --frozen-lockfile
+            yarn link
+          fi
+          cd "$GITHUB_WORKSPACE"
+          if [ "$PM" = "pnpm" ]; then
+            pnpm link "$JARVIS_LOCAL"
           else
-            cd "$JARVIS_LOCAL" && yarn link
+            yarn link @typeform/jarvis
           fi
-          cd $GITHUB_WORKSPACE && $PM link @typeform/jarvis
           echo "✅ Jarvis linked from local development copy"
           ls -la node_modules/@typeform/jarvis
         elif [ -n "$JARVIS_BRANCH" ]; then
@@ -59,8 +68,12 @@ runs:
             yarn link
           fi
           # Link to this project using caller's PM
-          cd $GITHUB_WORKSPACE
-          $PM link @typeform/jarvis
+          cd "$GITHUB_WORKSPACE"
+          if [ "$PM" = "pnpm" ]; then
+            pnpm link "$JARVIS_DIR"
+          else
+            yarn link @typeform/jarvis
+          fi
           
           echo "✅ Jarvis linked from GitHub branch: $JARVIS_BRANCH"
           echo "📍 Jarvis location: $JARVIS_DIR"
@@ -74,3 +87,9 @@ runs:
             echo "⚠️ Jarvis not found in node_modules - may need to run $PM install first"
           fi
         fi
+
+    - name: Install datadog-ci globally
+      shell: bash
+      run: |
+        npm install -g @datadog/datadog-ci@5.21.0
+        echo "$(npm prefix -g)/bin" >> $GITHUB_PATH