Skip to content

Commit 0c584ab

Browse files
TarunAdobeTarunAdobe
committed
chore: deploy vrts on main branch correctly
1 parent 142fe7f commit 0c584ab

File tree

1 file changed

+62
-65
lines changed

1 file changed

+62
-65
lines changed

‎.circleci/config.yml

Lines changed: 62 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -131,44 +131,43 @@ commands:
131131
when: always
132132
name: Deploy VRT Results to Azure Blob Storage
133133
command: |
134-
# Get PR number from CircleCI environment
135-
PR_NUMBER=""
136-
if [ -n "$CIRCLE_PULL_REQUEST" ]; then
137-
PR_NUMBER=$(echo $CIRCLE_PULL_REQUEST | sed 's/.*\/pull\///')
138-
echo "Deploying VRT for PR #$PR_NUMBER"
139-
elif [ -n "$CIRCLE_PR_NUMBER" ]; then
140-
PR_NUMBER="$CIRCLE_PR_NUMBER"
141-
echo "Deploying VRT for PR #$PR_NUMBER"
142-
elif [[ "$CIRCLE_BRANCH" =~ ^pull/[0-9]+$ ]]; then
143-
PR_NUMBER=$(echo $CIRCLE_BRANCH | sed 's/pull\///')
144-
echo "Deploying VRT for forked PR #$PR_NUMBER"
145-
elif [ -n "$GITHUB_TOKEN" ]; then
146-
# GitHub API fallback
147-
PR_NUMBER=$(curl -s -H "Authorization: Bearer $GITHUB_TOKEN" \
148-
-H "Accept: application/vnd.github+json" \
149-
"https://api.github.com/repos/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pulls?head=$CIRCLE_PROJECT_USERNAME:$CIRCLE_BRANCH&state=open" \
150-
| grep -o '"number":[0-9]*' | head -1 | sed 's/"number"://')
151-
152-
if [ -n "$PR_NUMBER" ]; then
153-
echo "Deploying VRT for PR #$PR_NUMBER (via GitHub API)"
134+
# Set deployment path based on branch
135+
if [ "$CIRCLE_BRANCH" = "main" ]; then
136+
PR_HASH="main"
137+
echo "Deploying VRT for main branch to main path"
138+
else
139+
# Get PR number from CircleCI environment
140+
PR_NUMBER=""
141+
if [ -n "$CIRCLE_PULL_REQUEST" ]; then
142+
PR_NUMBER=$(echo $CIRCLE_PULL_REQUEST | sed 's/.*\/pull\///')
143+
echo "Deploying VRT for PR #$PR_NUMBER"
144+
elif [ -n "$CIRCLE_PR_NUMBER" ]; then
145+
PR_NUMBER="$CIRCLE_PR_NUMBER"
146+
echo "Deploying VRT for PR #$PR_NUMBER"
147+
elif [[ "$CIRCLE_BRANCH" =~ ^pull/[0-9]+$ ]]; then
148+
PR_NUMBER=$(echo $CIRCLE_BRANCH | sed 's/pull\///')
149+
echo "Deploying VRT for forked PR #$PR_NUMBER"
150+
elif [ -n "$GITHUB_TOKEN" ]; then
151+
# GitHub API fallback
152+
PR_NUMBER=$(curl -s -H "Authorization: Bearer $GITHUB_TOKEN" \
153+
-H "Accept: application/vnd.github+json" \
154+
"https://api.github.com/repos/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pulls?head=$CIRCLE_PROJECT_USERNAME:$CIRCLE_BRANCH&state=open" \
155+
| grep -o '"number":[0-9]*' | head -1 | sed 's/"number"://')
156+
157+
if [ -n "$PR_NUMBER" ]; then
158+
echo "Deploying VRT for PR #$PR_NUMBER (via GitHub API)"
159+
else
160+
echo "⏭️ No PR found - skipping VRT deployment"
161+
exit 0
162+
fi
154163
else
155-
echo "⏭️ No PR found - skipping VRT deployment"
164+
echo "⏭️ No PR detected - skipping VRT deployment"
156165
exit 0
157166
fi
158-
else
159-
echo "⏭️ No PR detected - skipping VRT deployment"
160-
exit 0
161-
fi
162167
163-
# Only proceed if we have a valid PR number
164-
if [ -z "$PR_NUMBER" ]; then
165-
echo "⏭️ No PR number available - skipping VRT deployment"
166-
exit 0
168+
PR_HASH="pr-${PR_NUMBER}"
167169
fi
168170
169-
# Create PR hash using just PR number for overwriting deployments
170-
PR_HASH="pr-${PR_NUMBER}"
171-
172171
# VRT combination for subdirectory
173172
combination="<< parameters.regression_system >>-<< parameters.regression_color >>-<< parameters.regression_scale >>-<< parameters.regression_dir >>"
174173
@@ -357,45 +356,43 @@ jobs:
357356
when: always
358357
name: Deploy Visual Tests to Azure Blob Storage
359358
command: |
360-
# Get PR number from CircleCI environment
361-
set +x
362-
PR_NUMBER=""
363-
if [ -n "$CIRCLE_PULL_REQUEST" ]; then
364-
PR_NUMBER=$(echo $CIRCLE_PULL_REQUEST | sed 's/.*\/pull\///')
365-
echo "Deploying HCM VRT for PR #$PR_NUMBER"
366-
elif [ -n "$CIRCLE_PR_NUMBER" ]; then
367-
PR_NUMBER="$CIRCLE_PR_NUMBER"
368-
echo "Deploying HCM VRT for PR #$PR_NUMBER"
369-
elif [[ "$CIRCLE_BRANCH" =~ ^pull/[0-9]+$ ]]; then
370-
PR_NUMBER=$(echo $CIRCLE_BRANCH | sed 's/pull\///')
371-
echo "Deploying HCM VRT for forked PR #$PR_NUMBER"
372-
elif [ -n "$GITHUB_TOKEN" ]; then
373-
# GitHub API fallback
374-
PR_NUMBER=$(curl -s -H "Authorization: Bearer $GITHUB_TOKEN" \
375-
-H "Accept: application/vnd.github+json" \
376-
"https://api.github.com/repos/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pulls?head=$CIRCLE_PROJECT_USERNAME:$CIRCLE_BRANCH&state=open" \
377-
| grep -o '"number":[0-9]*' | head -1 | sed 's/"number"://')
378-
379-
if [ -n "$PR_NUMBER" ]; then
380-
echo "Deploying HCM VRT for PR #$PR_NUMBER (via GitHub API)"
359+
# Set deployment path based on branch
360+
if [ "$CIRCLE_BRANCH" = "main" ]; then
361+
PR_HASH="main"
362+
echo "Deploying HCM VRT for main branch to main path"
363+
else
364+
# Get PR number from CircleCI environment
365+
PR_NUMBER=""
366+
if [ -n "$CIRCLE_PULL_REQUEST" ]; then
367+
PR_NUMBER=$(echo $CIRCLE_PULL_REQUEST | sed 's/.*\/pull\///')
368+
echo "Deploying HCM VRT for PR #$PR_NUMBER"
369+
elif [ -n "$CIRCLE_PR_NUMBER" ]; then
370+
PR_NUMBER="$CIRCLE_PR_NUMBER"
371+
echo "Deploying HCM VRT for PR #$PR_NUMBER"
372+
elif [[ "$CIRCLE_BRANCH" =~ ^pull/[0-9]+$ ]]; then
373+
PR_NUMBER=$(echo $CIRCLE_BRANCH | sed 's/pull\///')
374+
echo "Deploying HCM VRT for forked PR #$PR_NUMBER"
375+
elif [ -n "$GITHUB_TOKEN" ]; then
376+
# GitHub API fallback
377+
PR_NUMBER=$(curl -s -H "Authorization: Bearer $GITHUB_TOKEN" \
378+
-H "Accept: application/vnd.github+json" \
379+
"https://api.github.com/repos/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pulls?head=$CIRCLE_PROJECT_USERNAME:$CIRCLE_BRANCH&state=open" \
380+
| grep -o '"number":[0-9]*' | head -1 | sed 's/"number"://')
381+
382+
if [ -n "$PR_NUMBER" ]; then
383+
echo "Deploying HCM VRT for PR #$PR_NUMBER (via GitHub API)"
384+
else
385+
echo "⏭️ No PR found - skipping HCM VRT deployment"
386+
exit 0
387+
fi
381388
else
382-
echo "⏭️ No PR found - skipping HCM VRT deployment"
389+
echo "⏭️ No PR detected - skipping HCM VRT deployment"
383390
exit 0
384391
fi
385-
else
386-
echo "⏭️ No PR detected - skipping HCM VRT deployment"
387-
exit 0
388-
fi
389392
390-
# Only proceed if we have a valid PR number
391-
if [ -z "$PR_NUMBER" ]; then
392-
echo "⏭️ No PR number available - skipping HCM VRT deployment"
393-
exit 0
393+
PR_HASH="pr-${PR_NUMBER}"
394394
fi
395395
396-
# Create PR hash using just PR number for overwriting deployments
397-
PR_HASH="pr-${PR_NUMBER}"
398-
399396
# Prepare files for deployment
400397
cp projects/documentation/content/favicon.ico test/visual/
401398

0 commit comments

Comments
 (0)