diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 793ef24c98..aa5ab8f2b8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,6 +15,7 @@ jobs: outputs: BUILD_DATE: ${{ steps.args.outputs.BUILD_DATE }} VERSION: ${{ steps.args.outputs.VERSION }} + DEFAULT_BRANCH: ${{ steps.args.outputs.DEFAULT_BRANCH }} RELEASE_ARGS: ${{ steps.args.outputs.RELEASE_ARGS }} steps: - name: Checkout @@ -52,6 +53,7 @@ jobs: echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT + echo "DEFAULT_BRANCH=${VERSION%-bandwidth.*}" >> $GITHUB_OUTPUT echo "RELEASE_ARGS=${RELEASE_ARGS}" >> $GITHUB_OUTPUT release: @@ -141,7 +143,7 @@ jobs: with: fetch-depth: 0 token: "${{ secrets.GHA_TOKEN }}" - ref: "band/${{ needs.args.outputs.VERSION }}" + ref: "band/${{ needs.args.outputs.DEFAULT_BRANCH }}" - name: Configure Git run: | @@ -175,7 +177,7 @@ jobs: with: fetch-depth: 0 token: "${{ secrets.GHA_TOKEN }}" - ref: "${{ github.event.repository.default_branch }}" + ref: "band/${{ needs.args.outputs.DEFAULT_BRANCH }}" - name: Configure Git run: | diff --git a/Makefile b/Makefile index 3baea18d23..7748852758 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ endif SHELL = /usr/bin/env bash -o pipefail .SHELLFLAGS = -ec -VERSION ?= 26.6.0-bandwidth.2 +VERSION ?= 26.6.0-bandwidth.3 # mariadb-operator IMG_NAME ?= ghcr.io/mariadb-operator/mariadb-operator diff --git a/docs/docker.md b/docs/docker.md index 3eab12e8c8..fa73462f96 100644 --- a/docs/docker.md +++ b/docs/docker.md @@ -36,7 +36,7 @@
ghcr.io/mariadb-operator/mariadb-operator:26.6.0-bandwidth.2ghcr.io/mariadb-operator/mariadb-operator:26.6.0-bandwidth.3amd64 arm64