Skip to content

Commit c4f270f

Browse files
authored
Internal: Fix cherry pick workflow [TMZ-803] (#580)
1 parent 0c614e2 commit c4f270f

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ on:
55
pull_request:
66
workflow_call:
77

8-
98
jobs:
109
build_plugin:
1110
name: Build theme

.github/workflows/cherry-pick-pr.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,11 @@ jobs:
6363
6464
echo "Processing cherry-pick for branch: $TARGET"
6565
66+
if ! git checkout -b "$BRANCH" "origin/$TARGET"; then
67+
echo "::warning:: Branch $TARGET does not exist - skipping"
68+
continue
69+
fi
70+
6671
if ! git cherry-pick -m 1 "$MERGE_SHA"; then
6772
echo "::error:: Cherry-pick conflicts detected for PR #${PR_NUMBER} on branch ${TARGET}"
6873

0 commit comments

Comments
 (0)