Skip to content

Commit b11782f

Browse files
committed
Update yml file
1 parent 9c24f62 commit b11782f

File tree

1 file changed

+2
-55
lines changed

1 file changed

+2
-55
lines changed

.github/workflows/sync-more-logins-e2e.yml renamed to .github/workflows/sync_more_logins_e2e.yml

Lines changed: 2 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
push:
66
branches:
77
- develop
8+
- W-18685522-reset-and-passwordless-integration-test
89
# Run daily at 11 PM PST (7 AM UTC) to catch any missed syncs
910
schedule:
1011
- cron: '0 7 * * *'
@@ -16,15 +17,6 @@ on:
1617
required: false
1718
default: false
1819
type: boolean
19-
sync_strategy:
20-
description: 'Sync strategy to use'
21-
required: false
22-
default: 'merge'
23-
type: choice
24-
options:
25-
- merge
26-
- rebase
27-
- reset
2820

2921
permissions:
3022
contents: write
@@ -75,31 +67,12 @@ jobs:
7567
exit 0
7668
fi
7769
78-
STRATEGY="${{ github.event.inputs.sync_strategy || 'merge' }}"
79-
echo "🔄 Attempting to sync using strategy: $STRATEGY"
80-
8170
if [ "${{ github.event.inputs.force_sync }}" = "true" ]; then
8271
echo "🔧 Force sync requested. Resetting to develop..."
8372
git reset --hard origin/develop
8473
git push --force origin more-logins-e2e-test
8574
echo "⚠️ Force synced more-logins-e2e-test with develop (all conflicts overwritten)"
8675
echo "status=force-synced" >> $GITHUB_OUTPUT
87-
elif [ "$STRATEGY" = "rebase" ]; then
88-
if git rebase origin/develop; then
89-
echo "✅ Successfully rebased more-logins-e2e-test onto develop"
90-
git push --force-with-lease origin more-logins-e2e-test
91-
echo "status=rebased" >> $GITHUB_OUTPUT
92-
else
93-
echo "❌ Rebase conflicts detected!"
94-
git rebase --abort
95-
echo "status=conflict" >> $GITHUB_OUTPUT
96-
exit 1
97-
fi
98-
elif [ "$STRATEGY" = "reset" ]; then
99-
git reset --hard origin/develop
100-
git push --force origin more-logins-e2e-test
101-
echo "✅ Reset more-logins-e2e-test to match develop"
102-
echo "status=reset" >> $GITHUB_OUTPUT
10376
else
10477
# Default merge strategy
10578
if git merge origin/develop --no-edit; then
@@ -242,30 +215,4 @@ jobs:
242215
TARGET: more-logins-e2e
243216
PROJECT: scaffold-pwa
244217
MESSAGE: "Auto-sync from develop - build ${{ github.run_id }} (${{ github.sha }})"
245-
FLAGS: --wait
246-
247-
- name: Get deployment URL
248-
id: deployment-url
249-
run: |
250-
URL="https://scaffold-pwa-more-logins-e2e.mobify-storefront.com"
251-
echo "url=${URL}" >> $GITHUB_OUTPUT
252-
echo "🚀 Deployment URL: ${URL}"
253-
254-
- name: Wait for deployment to be ready
255-
run: |
256-
URL="${{ steps.deployment-url.outputs.url }}"
257-
echo "⏳ Waiting for deployment to be ready at: $URL"
258-
259-
for i in {1..30}; do
260-
if curl -f -s "$URL" > /dev/null; then
261-
echo "✅ Deployment is ready!"
262-
exit 0
263-
fi
264-
echo "Attempt $i/30: Site not ready yet, waiting 30 seconds..."
265-
sleep 30
266-
done
267-
268-
echo "❌ Deployment did not become ready within 15 minutes"
269-
exit 1
270-
271-
# Removed notify job - no notifications needed
218+
FLAGS: --wait

0 commit comments

Comments
 (0)