Output unadorned version tag for releases #862
Merged
Conversation
This file contains 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
There's stuff out there with pretty weird ideas as to what constitutes a "correct" version number. We have been trying to solve this problem of "incorrect versioning" for over 30 years with no success. You have to wonder why that is. For the specific case of releases, in addition to using vX.Y.Z-0-sha, also output a vX.Y.Z tag. That allows stuff to be happy about seeing something that matches its expectations in terms of version numbers. We still need to output something else in the n != 0 case, because we need to be able to differentiate between intermediate builds. It's incorrect in semver terms, because those are prereleases that sort _before_ vX.Y.Z, not after it. To do it correctly, we would have to transform vX.Y.Z to vX.Y.(Z+1) and append the prerelease bit to that. Since that would become confusing really fast (in the face of existing practice), let's not do that. As long as nothing tries to "upgrade" vX.Y.Z-n-sha to vX.Y.Z, we shoud be OK. Signed-off-by: Marcelo E. Magallon <marcelo.magallon@grafana.com>
nadiamoe
reviewed
Sep 2, 2024
nadiamoe
approved these changes
Sep 4, 2024
The-9880
reviewed
Sep 4, 2024
| # If an optional suffix is provided, append it to all the tags as `-suffix`. | ||
| # Note that this breaks the semver format, because appending -foobar means it's | ||
| # a pre-release version, not a "flavor" as some people claim. The more | ||
| # appropriate way to express this would be to use `+suffix`, but we'll defer |
There was a problem hiding this comment.
Commenting to add further context - Docker tags don't support + in the character set currently:
The-9880
approved these changes
Sep 4, 2024
nadiamoe
added a commit
that referenced
this pull request
Sep 19, 2024
* Update module github.com/prometheus/common to v0.58.0 * Output unadorned version tag for releases (#862) * Update debian:stable-slim Docker digest to 64bc71f (#867) * Update module github.com/prometheus/client_golang to v1.20.3 (#869) * Update module github.com/prometheus/common to v0.59.1 (#870) * Update module golang.org/x/net to v0.29.0 * Update alpine:3.20 Docker digest to beefdbd (#874) * Update github.com/grafana/loki/pkg/push digest to 0780456 (#876) * Update golang.org/x/exp digest to e7e105d (#877) * Update renovatebot/github-action action to v40.2.8 * scripts: update go to 1.23 * Update module google.golang.org/grpc to v1.66.1 (#884) * Update module google.golang.org/grpc to v1.66.2 (#885) * Move browser Docker build into separate Dockerfile (#886) * Stop publishing browser image to GCR (#888) * Update grafana-build-tools to 0.23.1 (#889) * Migrate base image from Debian to Alpine (#875) * k6runner: error if script timeout is not set * scraper: use check frequency as the context deadline for k6 checks * scraper/test: work around panic if all settings are nil in test * k6runner/http: override only logger in WithLogger * k6runner/http: retry requests * k6runner: promote log messages surfacing errors to warning level * Update renovatebot/github-action action to v40.2.10 (#891) * Update module github.com/prometheus/client_golang to v1.20.4 (#893) * scripts/go: update gosec to v2 proper * Update module github.com/mccutchen/go-httpbin/v2 to v2.15.0 Signed-off-by: Nadia Santalla <nadia@santalla.io>
Merged
nadiamoe
added a commit
that referenced
this pull request
Sep 19, 2024
* Update module github.com/prometheus/common to v0.58.0 * Output unadorned version tag for releases (#862) * Update debian:stable-slim Docker digest to 64bc71f (#867) * Update module github.com/prometheus/client_golang to v1.20.3 (#869) * Update module github.com/prometheus/common to v0.59.1 (#870) * Update module golang.org/x/net to v0.29.0 * Update alpine:3.20 Docker digest to beefdbd (#874) * Update github.com/grafana/loki/pkg/push digest to 0780456 (#876) * Update golang.org/x/exp digest to e7e105d (#877) * Update renovatebot/github-action action to v40.2.8 * scripts: update go to 1.23 * Update module google.golang.org/grpc to v1.66.1 (#884) * Update module google.golang.org/grpc to v1.66.2 (#885) * Move browser Docker build into separate Dockerfile (#886) * Stop publishing browser image to GCR (#888) * Update grafana-build-tools to 0.23.1 (#889) * Migrate base image from Debian to Alpine (#875) * k6runner: error if script timeout is not set * scraper: use check frequency as the context deadline for k6 checks * scraper/test: work around panic if all settings are nil in test * k6runner/http: override only logger in WithLogger * k6runner/http: retry requests * k6runner: promote log messages surfacing errors to warning level * Update renovatebot/github-action action to v40.2.10 (#891) * Update module github.com/prometheus/client_golang to v1.20.4 (#893) * scripts/go: update gosec to v2 proper * Update module github.com/mccutchen/go-httpbin/v2 to v2.15.0 Signed-off-by: Nadia Santalla <nadia@santalla.io>
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.
There's stuff out there with pretty weird ideas as to what constitutes a "correct" version number. We have been trying to solve this problem of "incorrect versioning" for over 30 years with no success. You have to wonder why that is.
For the specific case of releases, in addition to using vX.Y.Z-0-sha, also output a vX.Y.Z tag. That allows stuff to be happy about seeing something that matches its expectations in terms of version numbers. We still need to output something else in the n != 0 case, because we need to be able to differentiate between intermediate builds. It's incorrect in semver terms, because those are prereleases that sort before vX.Y.Z, not after it. To do it correctly, we would have to transform vX.Y.Z to vX.Y.(Z+1) and append the prerelease bit to that. Since that would become confusing really fast (in the face of existing practice), let's not do that. As long as nothing tries to "upgrade" vX.Y.Z-n-sha to vX.Y.Z, we shoud be OK.