Skip to content

Commit b90d43f

Browse files
authored
fix: preserve Helm chart prerelease mode (#394)
* fix: preserve Helm chart prerelease mode The chart version calculation ignored the prerelease suffix already carried by the published app version. Resolve chart versions through a tested helper so RC mode and reviewed chart bumps survive workflow updates. Signed-off-by: Jayesh Savaliya <jsavaliya.tech@gmail.com> * fix: advance chart prereleases independently Signed-off-by: Jayesh Savaliya <jsavaliya.tech@gmail.com> * address chart version review comments --------- Signed-off-by: Jayesh Savaliya <jsavaliya.tech@gmail.com>
1 parent f18e67f commit b90d43f

4 files changed

Lines changed: 138 additions & 18 deletions

File tree

‎.github/workflows/build-and-prepare-chart-release.yml‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -149,31 +149,19 @@ jobs:
149149
UPDATE_APP_VERSION: ${{ needs.resolve.outputs.update_app_version }}
150150
run: |
151151
set -euo pipefail
152-
SEMVER='^([0-9]+)\.([0-9]+)\.([0-9]+)(-[0-9A-Za-z.-]+)?$'
153152
CURRENT=$(yq -r '.version' charts/trueforge/Chart.yaml)
154-
if [[ ! "$CURRENT" =~ $SEMVER ]]; then
155-
echo "Chart.yaml version '$CURRENT' on $GITHUB_REF_NAME is not semver" >&2
156-
exit 1
157-
fi
158-
MAJOR="${BASH_REMATCH[1]}"
159-
MINOR="${BASH_REMATCH[2]}"
160-
PATCH="${BASH_REMATCH[3]}"
161-
VERSION="${MAJOR}.${MINOR}.$((PATCH + 1))"
153+
PR_VERSION=""
162154
163155
# create-pull-request rebuilds the PR branch from base plus this
164156
# workspace, so a reviewer's major/minor bump on the open PR is dropped
165-
# unless it is re-applied here. Only outrank the patch bump: a PR
166-
# version at or below it means base already absorbed that release.
157+
# unless it is re-applied here.
167158
if git ls-remote --exit-code --heads origin "$PR_BRANCH" >/dev/null 2>&1; then
168159
git fetch --depth=1 origin "$PR_BRANCH"
169160
PR_VERSION=$(git show FETCH_HEAD:charts/trueforge/Chart.yaml | yq -r '.version')
170-
if [[ "$PR_VERSION" =~ $SEMVER ]] &&
171-
(( BASH_REMATCH[1] > MAJOR ||
172-
(BASH_REMATCH[1] == MAJOR && BASH_REMATCH[2] > MINOR) ||
173-
(BASH_REMATCH[1] == MAJOR && BASH_REMATCH[2] == MINOR && BASH_REMATCH[3] > PATCH + 1) )); then
174-
echo "Keeping chart version $PR_VERSION from $PR_BRANCH (over $VERSION)"
175-
VERSION="$PR_VERSION"
176-
fi
161+
fi
162+
VERSION=$(bash scripts/resolve-chart-version.sh "$CURRENT" "$APP_VERSION" "$PR_VERSION")
163+
if [[ -n "$PR_VERSION" && "$VERSION" == "$PR_VERSION" ]]; then
164+
echo "Keeping chart version $PR_VERSION from $PR_BRANCH"
177165
fi
178166
export VERSION IMAGE_TAG APP_VERSION
179167
yq -i '.version = strenv(VERSION)' charts/trueforge/Chart.yaml

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
"start": "STANDALONE=false NODE_ENV=production pnpm --filter @truefoundry/trueforge start",
3838
"push-sandbox-image-to-daytona": "pnpm --filter @truefoundry/trueforge push-sandbox-image-to-daytona",
3939
"test:frontend": "pnpm --filter frontend test",
40+
"test:chart-version": "bash tests/scripts/resolve-chart-version.test.sh",
4041
"test:trueforge-core": "pnpm --filter @truefoundry/trueforge-core test",
4142
"test:trueforge": "pnpm --filter @truefoundry/trueforge test",
4243
"test:local-sandbox:contract": "pnpm --filter @truefoundry/trueforge test:local-sandbox:contract",

‎scripts/resolve-chart-version.sh‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
#!/usr/bin/env bash
2+
set -euo pipefail
3+
4+
CURRENT=${1:?current chart version is required}
5+
APP_VERSION=${2:?app version is required}
6+
PR_VERSION=${3:-}
7+
8+
SEMVER='^([0-9]+)\.([0-9]+)\.([0-9]+)(-[0-9A-Za-z.-]+)?$'
9+
10+
if [[ ! "$CURRENT" =~ $SEMVER ]]; then
11+
echo "Current chart version '$CURRENT' is not semver" >&2
12+
exit 1
13+
fi
14+
15+
MAJOR=${BASH_REMATCH[1]}
16+
MINOR=${BASH_REMATCH[2]}
17+
PATCH=${BASH_REMATCH[3]}
18+
CURRENT_PRERELEASE=${BASH_REMATCH[4]:-}
19+
SELECTED_MAJOR=$MAJOR
20+
SELECTED_MINOR=$MINOR
21+
SELECTED_PATCH=$PATCH
22+
23+
# A stable chart starts the next patch. A prerelease chart is already on its
24+
# target core, so subsequent RCs and the stable release keep that core.
25+
if [[ -z "$CURRENT_PRERELEASE" ]]; then
26+
SELECTED_PATCH=$((PATCH + 1))
27+
fi
28+
29+
if [[ ! "$APP_VERSION" =~ $SEMVER ]]; then
30+
echo "App version '$APP_VERSION' is not semver" >&2
31+
exit 1
32+
fi
33+
34+
APP_PRERELEASE=${BASH_REMATCH[4]:-}
35+
PR_PRERELEASE=""
36+
PR_CORE_SELECTED=false
37+
38+
if [[ -n "$PR_VERSION" && "$PR_VERSION" =~ $SEMVER ]]; then
39+
PR_MAJOR=${BASH_REMATCH[1]}
40+
PR_MINOR=${BASH_REMATCH[2]}
41+
PR_PATCH=${BASH_REMATCH[3]}
42+
PR_PRERELEASE=${BASH_REMATCH[4]:-}
43+
44+
if ((PR_MAJOR > SELECTED_MAJOR ||
45+
(PR_MAJOR == SELECTED_MAJOR && PR_MINOR > SELECTED_MINOR) ||
46+
(PR_MAJOR == SELECTED_MAJOR && PR_MINOR == SELECTED_MINOR && PR_PATCH > SELECTED_PATCH))); then
47+
SELECTED_MAJOR=$PR_MAJOR
48+
SELECTED_MINOR=$PR_MINOR
49+
SELECTED_PATCH=$PR_PATCH
50+
PR_CORE_SELECTED=true
51+
elif ((PR_MAJOR == SELECTED_MAJOR && PR_MINOR == SELECTED_MINOR && PR_PATCH == SELECTED_PATCH)); then
52+
PR_CORE_SELECTED=true
53+
fi
54+
fi
55+
56+
# The app version only selects stable or prerelease mode. Chart RC counters are
57+
# derived from chart versions and advance independently from the app's suffix.
58+
SELECTED_PRERELEASE=""
59+
if [[ -n "$APP_PRERELEASE" ]]; then
60+
RC_COUNTER='^-rc\.([0-9]+)$'
61+
HIGHEST_RC=-1
62+
63+
if ((MAJOR == SELECTED_MAJOR && MINOR == SELECTED_MINOR && PATCH == SELECTED_PATCH)) &&
64+
[[ "$CURRENT_PRERELEASE" =~ $RC_COUNTER ]]; then
65+
HIGHEST_RC=${BASH_REMATCH[1]}
66+
fi
67+
68+
if [[ "$PR_CORE_SELECTED" == true && "$PR_PRERELEASE" =~ $RC_COUNTER ]]; then
69+
PR_COUNTER=${BASH_REMATCH[1]}
70+
if ((PR_COUNTER > HIGHEST_RC)); then
71+
HIGHEST_RC=$PR_COUNTER
72+
fi
73+
fi
74+
75+
SELECTED_PRERELEASE="-rc.$((HIGHEST_RC + 1))"
76+
fi
77+
78+
VERSION="${SELECTED_MAJOR}.${SELECTED_MINOR}.${SELECTED_PATCH}${SELECTED_PRERELEASE}"
79+
printf '%s\n' "$VERSION"
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
#!/usr/bin/env bash
2+
set -euo pipefail
3+
4+
cd "$(dirname "$0")/../.."
5+
6+
resolver=scripts/resolve-chart-version.sh
7+
failures=0
8+
9+
assert_version() {
10+
local expected=$1
11+
local current=$2
12+
local app_version=$3
13+
local pr_version=${4:-}
14+
local actual
15+
16+
actual=$(bash "$resolver" "$current" "$app_version" "$pr_version")
17+
if [[ "$actual" != "$expected" ]]; then
18+
printf 'FAIL: current=%s app=%s pr=%s expected=%s actual=%s\n' \
19+
"$current" "$app_version" "${pr_version:-none}" "$expected" "$actual" >&2
20+
failures=$((failures + 1))
21+
fi
22+
}
23+
24+
# Stable chart releases continue with patch bumps.
25+
assert_version 0.1.6 0.1.5 0.1.5
26+
assert_version 0.1.7 0.1.6 0.1.6
27+
28+
# Entering prerelease mode starts the chart's own RC counter at zero. The app's
29+
# prerelease tag and counter do not influence the chart version.
30+
assert_version 0.1.6-rc.0 0.1.5 0.1.5-rc.2
31+
32+
# Merged chart RCs and RCs in the open chart PR both advance linearly.
33+
assert_version 0.1.6-rc.1 0.1.6-rc.0 0.1.5-rc.99
34+
assert_version 0.1.6-rc.4 0.1.6-rc.3 0.1.5-rc.0
35+
assert_version 0.1.6-rc.1 0.1.5 0.1.5-rc.7 0.1.6-rc.0
36+
assert_version 0.1.6-rc.5 0.1.6-rc.3 0.1.5-rc.7 0.1.6-rc.4
37+
38+
# Leaving prerelease mode stabilizes the existing core before patch bumps resume.
39+
assert_version 0.1.6 0.1.6-rc.4 0.1.6
40+
assert_version 0.1.6 0.1.5 0.1.6 0.1.6-rc.4
41+
42+
# A reviewed higher chart core is preserved without coupling it to the app core.
43+
assert_version 0.2.0-rc.0 0.1.5 0.1.5-rc.3 0.2.0
44+
assert_version 0.2.0-rc.5 0.1.5 0.1.5-rc.3 0.2.0-rc.4
45+
assert_version 0.2.0 0.1.5 0.1.5 0.2.0-rc.4
46+
assert_version 0.1.6-rc.0 0.1.5 0.1.5-rc.3 0.1.4-rc.9
47+
48+
if ((failures > 0)); then
49+
exit 1
50+
fi
51+
52+
echo "Chart version resolution tests passed"

0 commit comments

Comments
 (0)