From 8f34ac4f20eb6f7fc467393d5754d8be5338a8e6 Mon Sep 17 00:00:00 2001 From: David Karlsson Date: Wed, 12 Apr 2023 10:04:30 +0200 Subject: [PATCH] ci: fix auto-publish workflow Signed-off-by: David Karlsson --- .github/workflows/merge.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index df496d3767..d19f236a17 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -13,11 +13,17 @@ jobs: if: github.repository_owner == 'docker' steps: - uses: actions/checkout@v3 + with: + ref: published + - name: Reset published branch + run: | + git fetch origin main:main + git reset --hard main - name: Create Pull Request uses: peter-evans/create-pull-request@5b4a9f6a9e2af26e5f02351490b90d01eb8ec1e5 with: delete-branch: false - branch: published + branch: published-update commit-message: publish updates from main labels: area/release title: publish updates from main