From 97a94073dba50a48245df15ca1053c0f38f87017 Mon Sep 17 00:00:00 2001 From: Sun Serega Date: Sun, 15 Dec 2024 16:31:23 +0100 Subject: [PATCH] +1 --- .github/workflows/upstream force tracking.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/upstream force tracking.yaml b/.github/workflows/upstream force tracking.yaml index c4e766a5..6cf387b3 100644 --- a/.github/workflows/upstream force tracking.yaml +++ b/.github/workflows/upstream force tracking.yaml @@ -1,6 +1,9 @@ -name: Upstream force tracking +name: Upstream PR force-push tracking on: + push: + branches-ignore: + - 'subm-pretest/**' schedule: - cron: '30 * * * *' workflow_dispatch: @@ -168,12 +171,12 @@ jobs: # Write-Host "No upstream changes for PR $pr_num" continue } - Write-Host "Upstream changes for PR $pr_num: $upstream_fwd_c new commits" + Write-Host "Upstream changes for PR ${pr_num}: $upstream_fwd_c new commits" $ft_fwd_c = git rev-list --count "$b_r_upstream..HEAD" if (-not $?) { throw "git rev-list failed" } if ($ft_fwd_c -eq 0) { - Write-Host "Force-tracking branch for PR $pr_num is in-line with upstream, fast-forwarding" + Write-Host "Force-tracking branch is inline under upstream, fast-forwarding" git reset --hard $b_r_upstream if (-not $?) { throw "git reset failed" } git push