[20.10 backport] [deb] fixes for version generating#831
Merged
thaJeztah merged 5 commits intoJan 19, 2023
Conversation
macOS uses the BSD flavor of `date`, which does not support the `--date` option
to set a custom time. Previously, we were using an alpine container to provide a
GNU flavor of date, which was a bit of a hack.
This patch rewrites the script to work on macOS directly, without the need of
a container:
./static/gen-static-ver . v1.2.3-dev
0.0.0-20220404154104-b815498
docker run --rm -v $(pwd):/src -w /src golang bash -c './static/gen-static-ver . v1.2.3-dev'
0.0.0-20220404154104-b815498
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 17a21b8)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
The script assumed that pre-release suffixes used the format `-tp<number>`, `-beta<number>` or `-rc<number>`, however, it's more common (and standard practice in SemVer) to delimit the `alpha/beta/rc` with a `.`, which allows SemVer comparing to first sort by pre-release version (`alpha`, `beta`, `rc`), then by the numeric suffix. Altogether, we should consider removing this code; using `tp` as a pre-release *before* `alpha` / `beta` is non-standard (pre-releases are named `alpha`, `beta`, `rc`, so that they can be sorted alphabetically. Using `tp` violates that assumption, and adds the complexity of having to add a numeric prefix to make it sort again. Also see https://www.debian.org/doc/debian-policy/ch-controlfields.html#epochs-should-be-used-sparingly Before: ./rpm/gen-rpm-ver . 22.06.0-beta0 22.06.0 1.0.beta0 6e7db7f 22.06.0-beta0 ./rpm/gen-rpm-ver . 22.06.0-beta.0 22.06.0.beta.0 3 6e7db7f 22.06.0-beta.0 ./deb/gen-deb-ver . 22.06.0-beta0 22.06.0~1.0.beta0 22.06.0-beta0 ./deb/gen-deb-ver . 22.06.0-beta.0 22.06.0~beta.0~3 22.06.0-beta.0 After: ./rpm/gen-rpm-ver . 22.06.0-beta0 22.06.0 1.0.beta0 3091da7 22.06.0-beta0 ./rpm/gen-rpm-ver . 22.06.0-beta.0 22.06.0 1.0.beta.0 3091da7 22.06.0-beta.0 ./deb/gen-deb-ver . 22.06.0-beta0 22.06.0~1.0.beta0 22.06.0-beta0 ./deb/gen-deb-ver . 22.06.0-beta.0 22.06.0~1.0.beta.0 22.06.0-beta.0 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 005f613) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This unifies the logic/code for generating pseudo-versions for nightly builds; - Generate pseudo-version if the source repository has uncommitted changes - Fix code to work on macOS - Strip "v" prefix if the passed VERSION has one Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 538e7f1) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
The script had special handling for pre-releases, because at some point we
used `-tp` ("technical preview") as suffix for pre-releases instead of the
standard `-alpha`, `-beta`, `-rc`.
The problem arised because of that, was that comparing versions wouldn't work,
as these suffixes are compared in _alphabetical_ order (which meant that `tp`
would come "after" `beta` and `rc`). To work around this, some custom code
was added to insert a numeric version _before_ the `tp`, `beta`, and `rc`.
We no longer plan to use `-tp` for pre-releases, and instead to just use the
common `alpha[.number]`, `beta[.number]`, `rc[.number]` suffixes.
This patch removes the custom handling for pre-releases, to simplify the version
that's generated.
Before:
./rpm/gen-rpm-ver . 22.06.0-beta.0
22.06.0 1.0.beta.0 3091da7 22.06.0-beta.0
./deb/gen-deb-ver . 22.06.0-beta.0
22.06.0~1.0.beta.0 22.06.0-beta.0
After:
./rpm/gen-rpm-ver . 22.06.0-beta.0
22.06.0~beta.0 1 0b5a1ae 22.06.0-beta.0
./deb/gen-deb-ver . 22.06.0-beta.0
22.06.0~beta.0 22.06.0-beta.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit ba44734)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
commented
Jan 19, 2023
| debVersion="$(gen_deb_version "$debVersion" rc 2)" | ||
| ;; | ||
| *) | ||
| debVersion="$debVersion-3" |
Member
Author
There was a problem hiding this comment.
Need to make some changes to preserve this ~3 for the 20.10 branch (for now) so that the docker-ce, docker-ce-cli, and docker-ce-rootless-extras packages keep it (23.0.0 will start using the new versioning scheme)
Make sure to continue using the "old" versioning for the 20.10 packages (docker-ce, docker-ce-cli, docker-rootless-extras). Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
commented
Jan 19, 2023
Comment on lines
+43
to
+47
| # Note: on the 20.10 branch, we preserve the "~3" suffix that was removed in | ||
| # commit 8a720b28a5d0db8fc93423cca79ca21b9b69f1f1, and continue using the | ||
| # old version scheme for docker-ce, docker-ce-cli, and docker-rootless-extras. | ||
| cat > "debian/changelog" <<-EOF | ||
| $debSource (${EPOCH}${EPOCH_SEP}${DEB_VERSION}-0~${DISTRO}-${SUITE}) $SUITE; urgency=low | ||
| $debSource (${EPOCH}${EPOCH_SEP}${DEB_VERSION}~3-0~${DISTRO}-${SUITE}) $SUITE; urgency=low |
Member
Author
There was a problem hiding this comment.
Revert the changes from 8a720b2 for the docker-ce packages (but continue using the new format for the plugins, so that we don't push the same version of a plugin twice (once through the 23.0 release, once through the 20.10 release).
Contributor
There was a problem hiding this comment.
Wait, what's the ~3 here for? (Sorry, I'm missing some context 🙈)
Member
Author
There was a problem hiding this comment.
This was used in 20.10 (and before) to.. make sure "stable" releases ranked higher than "pre-releases" (:lolsob:). I removed that code from master, but the same generation code is used for all deb versions, so I backported removing that ugly hack in this PR (see 8a720b2). However, as 20.10 is reaching its end, I didn't want to introduce changing the versioning scheme for it, so I added it back here. As we're not planning to do -beta releases for 20.10 patch releases, I hardcoded it to ~3 (which was used to designate "stable releases').
thaJeztah
commented
Jan 19, 2023
Comment on lines
+45
to
+50
| # rpmRelease=1 | ||
|
|
||
| # Note: on the 20.10 branch, continue using "3" as default, which was removed in | ||
| # commit 8a720b28a5d0db8fc93423cca79ca21b9b69f1f1. 23.0.0 and up use "1" | ||
| # as default. | ||
| rpmRelease=3 |
vvoland
approved these changes
Jan 19, 2023
Member
Author
|
Thx! Let me bring this one in |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Backports: