From f1df0b1ebda6cd48db2f11d1033497f813c835eb Mon Sep 17 00:00:00 2001 From: liquibot Date: Tue, 28 Jan 2025 10:39:31 -0600 Subject: [PATCH] Add steps to fetch and rebase official images repository in release workflow. Ensures the repo is in sync with the latest state from the remote --- .github/workflows/create-release.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index a977866..ec29eb7 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -80,7 +80,8 @@ jobs: run: | git config user.name "liquibot" git config user.email "liquibot@liquibase.org" - + + - name: Update Dockerfile and commit changes run: | file_list=("Dockerfile" "Dockerfile.alpine") @@ -209,6 +210,17 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }} steps: + - name: Fetch and Rebase Official Images Repository + run: | + git clone https://github.com/docker-library/official-images.git + cd official-images + git fetch origin master + git checkout master + # Reset liquibase:master to match official master + git checkout -B liquibase:master + git reset --hard origin/master + # Push the reset liquibase:master back to the remote repository + git push origin liquibase:master --force - name: Extract major.minor version id: extract_version