Skip to content

Commit e353291

Browse files
committed
chore(*): update prerelease helm chart versions
Signed-off-by: Vaughn Dice <vdice@akamai.com>
1 parent 867bd7c commit e353291

2 files changed

Lines changed: 4 additions & 7 deletions

File tree

.github/workflows/helm-chart-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ jobs:
2626

2727
steps:
2828
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
29+
with:
30+
fetch-depth: 0
2931

3032
- name: Install helm
3133
uses: Azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4.3.1
@@ -39,9 +41,7 @@ jobs:
3941
echo "CHART_VERSION=$(echo -n ${{ github.ref_name }} | sed -rn 's/(v)?(.*)/\2/p')" >> $GITHUB_ENV
4042
echo "APP_VERSION=${{ github.ref_name }}" >> $GITHUB_ENV
4143
else
42-
# NOTE: We can replace 0.0.0 with e.g. $(git describe --tags $(git rev-list --tags --max-count=1)) once we have a first tag
43-
# However, we'll also need to update the checkout step with 'fetch-depth: 0' if we list tags
44-
echo "CHART_VERSION=0.0.0-$(date +%Y%m%d-%H%M%S)-g$(git rev-parse --short HEAD)" >> $GITHUB_ENV
44+
echo "CHART_VERSION=$(git describe --tags $(git rev-list --tags --max-count=1))-$(date +%Y%m%d-%H%M%S)-g$(git rev-parse --short HEAD)" >> $GITHUB_ENV
4545
# Setting to 'latest' to match tag used in container-image.yml
4646
echo "APP_VERSION=latest" >> $GITHUB_ENV
4747
fi

Makefile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,7 @@ kind: create-kind-cluster install
238238
HELM ?= helm
239239
CHART_NAME := runtime-class-manager
240240
CHART_REGISTRY ?= ghcr.io/spinframework/charts
241-
# We can update 0.0.0 to the most recent tag once we have a first git tag.
242-
# Note that the leading 'v' must be dropped per Helm's versioning requirements
243-
# e.g. $(shell git describe --tags --abbrev=0 | sed -rn 's/(v)?(.*)/\2/p')
244-
CHART_VERSION ?= 0.0.0-$(VERSION)
241+
CHART_VERSION ?= $(shell git describe --tags --abbrev=0 | sed -rn 's/(v)?(.*)/\2/p')-$(VERSION)
245242
APP_VERSION ?= $(VERSION)
246243
STAGING_DIR ?= _dist
247244

0 commit comments

Comments
 (0)