diff --git a/.gitea/workflows/trigger-superpowers-sync.yml b/.gitea/workflows/trigger-superpowers-sync.yml index de360e7..098c0a1 100644 --- a/.gitea/workflows/trigger-superpowers-sync.yml +++ b/.gitea/workflows/trigger-superpowers-sync.yml @@ -53,18 +53,10 @@ jobs: cd "$REPO_DIR" fi - TARGET_SHA="${{ github.sha }}" - TARGET_REF="${{ github.ref }}" - if git cat-file -e "$TARGET_SHA^{commit}" 2>/dev/null; then - git checkout -f "$TARGET_SHA" - else - if [ -n "$TARGET_REF" ]; then - git fetch origin "$TARGET_REF" - git checkout -f FETCH_HEAD - else - git checkout -f "${{ github.ref_name }}" - fi - fi + # Always run trigger from the latest target branch state. + # This avoids stale push refs pulling in outdated workflow logic. + git fetch origin "$TARGET_BRANCH" + git checkout -B "$TARGET_BRANCH" "origin/$TARGET_BRANCH" git config --global --add safe.directory "$REPO_DIR" echo "REPO_DIR=$REPO_DIR" >> $GITHUB_ENV