Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/frontend-deploy-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/frontend-pr-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
29 changes: 24 additions & 5 deletions shared-actions/setup-jarvis/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand All @@ -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