build: validate edge version in release workflow #13993
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Currently when an edge version is tagged, it gets validated only until the chart_deploy job. If it fails, the release CLI gets published but the chart not, leaving things in a mixed bad state. This change validates the version early on in the release.yml workflow. It repurposes the script bin/helm-bump-edge as bin/compute-edge-version which performs the validation, and optionally mutates the version in the helm charts (the latter being used only in the chart_deploy job). The following tests the functionality, assuming the tip of the repo is tagged as `edge-25.5.1` and a new tag is expected to be `edge-25.5.2`: ```bash # Remove current tag $ git tag -d edge-25.5.1 # Test with invalid tag $ git tag edge-25.5.3 $ bin/compute-edge-version Tag (edge-25.5.3) doesn't match computed edge version (edge-25.5.2) # Test with valid tag $ git tag -d edge-25.5.3 Deleted tag 'edge-25.5.3' (was 4823b7a) $ git tag edge-25.5.2 # Empty results means success $ bin/compute-edge-version # Mutate charts $ bin/compute-edge-version update-charts Bumping charts/linkerd2-cni/Chart.yaml to 2025.5.2 Bumping charts/linkerd-control-plane/Chart.yaml to 2025.5.2 Bumping charts/linkerd-crds/Chart.yaml to 2025.5.2 Bumping jaeger/charts/linkerd-jaeger/Chart.yaml to 2025.5.2 Bumping multicluster/charts/linkerd-multicluster/Chart.yaml to 2025.5.2 Bumping viz/charts/linkerd-viz/Chart.yaml to 2025.5.2 ```
alpeb
commented
May 5, 2025
| @@ -11,7 +11,7 @@ bindir=$( cd "${BASH_SOURCE[0]%/*}" && pwd ) | |||
| . "$bindir"/_tag.sh | |||
| tag=$(named_tag) | |||
|
|
|||
| edge_tag_regex='edge-([0-9][0-9])\.([0-9]|[0-9][0-9])\.([0-9]+)' | |||
| edge_tag_regex='edge-([0-9][0-9]).([0-9]|[0-9][0-9]).([0-9]+)' | |||
There was a problem hiding this comment.
dots don't need to be escaped in this context. Doing so makes awk show a warning.
olix0r
approved these changes
May 8, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently when an edge version is tagged, it gets validated only until the chart_deploy job. If it fails, the release CLI gets published but the chart not, leaving things in a mixed bad state.
This change validates the version early on in the release.yml workflow.
It repurposes the script bin/helm-bump-edge as bin/compute-edge-version which performs the validation, and optionally mutates the version in the helm charts (the latter being used only in the chart_deploy job).
The following tests the functionality, assuming the tip of the repo is tagged as
edge-25.5.1and a new tag is expected to beedge-25.5.2: