Skip to content

Commit c2390f4

Browse files
authored
use correct commit for v2.0.x release (#11201)
Signed-off-by: Lawrence Gadban <lawrence.gadban@solo.io>
1 parent 5b60802 commit c2390f4

File tree

2 files changed

+1
-19
lines changed

2 files changed

+1
-19
lines changed

.github/workflows/release.yaml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,6 @@ jobs:
5555
VERSION="v0.0.0-manual-${GIT_SHA}"
5656
fi
5757
echo "goreleaser_args=--clean --skip=validate" >> $GITHUB_OUTPUT
58-
elif [[ $GITHUB_REF == refs/tags/* ]]; then
59-
VERSION="${GITHUB_REF#refs/tags/}"
60-
echo "goreleaser_args=--clean" >> $GITHUB_OUTPUT
61-
elif [[ $GITHUB_REF == refs/heads/main ]]; then
62-
VERSION="v2.0.0-main"
63-
echo "goreleaser_args=--clean --skip=validate" >> $GITHUB_OUTPUT
6458
elif [[ $GITHUB_REF == refs/pull/* ]]; then
6559
GIT_TAG=$(git describe --tags --abbrev=0)
6660
PR_NUM=$(echo "${GITHUB_REF}" | sed -E 's|refs/pull/([^/]+)/?.*|\1|')
@@ -108,19 +102,6 @@ jobs:
108102
- name: Prep Go Runner
109103
uses: ./.github/actions/prep-go-runner
110104

111-
# We publish a rolling main release for every commit to main. Deleting the release
112-
# ensures that the tagged commit is not stale. Goreleaser will create a new tag
113-
# and release for the tagged commit.
114-
- name: Delete v2.0.0-main release if it exists
115-
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
116-
continue-on-error: true
117-
run: |
118-
set -x
119-
echo "Deleting the v2.0.0-main release"
120-
gh release delete v2.0.0-main --repo ${{ github.repository }} --yes --cleanup-tag
121-
env:
122-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
123-
124105
- name: Log into ghcr.io
125106
if: ${{ github.event_name != 'pull_request' }}
126107
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0

.goreleaser.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ release:
176176
prerelease: "auto"
177177
mode: "replace"
178178
replace_existing_artifacts: true
179+
target_commitish: "{{ .FullCommit }}"
179180
header: |
180181
{{ if eq .Env.VERSION "v2.0.0-main" }}
181182
🚀 Nightly build of kgateway!

0 commit comments

Comments
 (0)