[1.1] allow overriding VERSION value in Makefile#4270
Merged
AkihiroSuda merged 1 commit intoopencontainers:release-1.1from May 7, 2024
Merged
[1.1] allow overriding VERSION value in Makefile#4270AkihiroSuda merged 1 commit intoopencontainers:release-1.1from
AkihiroSuda merged 1 commit intoopencontainers:release-1.1from
Conversation
this allows using a custom version string while building runc without modifying the VERSION file Signed-off-by: Akhil Mohan <[email protected]> (cherry picked from commit 9d9273c) Signed-off-by: Akhil Mohan <[email protected]>
Contributor
Author
|
The failure in vagrant -- fedora seems unrelated. Can someone retrigger the failed test? |
AkihiroSuda
approved these changes
May 7, 2024
Merged
Contributor
|
This change broke my builds. |
This was referenced Aug 6, 2024
rata
added a commit
to rata/runc
that referenced
this pull request
Aug 8, 2024
This reverts commit 9d9273c. This commit broke the build for several other projects (see comments here: opencontainers#4270, after the merge) and we don't really need this to be able to set the version without changing the file. With this commit reverted, we can still run: make VERSION="1.2.3" and it just works. It doesn't take it from an env variable, but that is what broke all the other projects (VERSION is just too generic as an env var, especially for a project like runc that is embedded in many others). Signed-off-by: Rodrigo Campos <[email protected]>
Member
|
I've opened a PR to revert this change |
rata
added a commit
to rata/runc
that referenced
this pull request
Aug 13, 2024
This reverts commit 9d9273c. This commit broke the build for several other projects (see comments here: opencontainers#4270, after the merge) and we don't really need this to be able to set the version without changing the file. With this commit reverted, we can still run: make VERSION="1.2.3" and it just works. It doesn't take it from an env variable, but that is what broke all the other projects (VERSION is just too generic as an env var, especially for a project like runc that is embedded in many others). Signed-off-by: Rodrigo Campos <[email protected]>
rata
added a commit
to rata/runc
that referenced
this pull request
Aug 14, 2024
This reverts commit 9d9273c. This commit broke the build for several other projects (see comments here: opencontainers#4270, after the merge) and we don't really need this to be able to set the version without changing the file. With this commit reverted, we can still run: make VERSION="1.2.3" and it just works. It doesn't take it from an env variable, but that is what broke all the other projects (VERSION is just too generic as an env var, especially for a project like runc that is embedded in many others). Signed-off-by: Rodrigo Campos <[email protected]>
rata
added a commit
to rata/runc
that referenced
this pull request
Aug 15, 2024
This reverts commit 9d9273c. This commit broke the build for several other projects (see comments here: opencontainers#4270, after the merge) and we don't really need this to be able to set the version without changing the file. With this commit reverted, we can still run: make VERSION="1.2.3" and it just works. It doesn't take it from an env variable, but that is what broke all the other projects (VERSION is just too generic as an env var, especially for a project like runc that is embedded in many others). Signed-off-by: Rodrigo Campos <[email protected]>
rata
added a commit
to rata/runc
that referenced
this pull request
Aug 15, 2024
We recently switched VERSION to be read from env vars (opencontainers#4270). This broke several projects, as they were building runc and using a `VERSION` env var for, e.g. the containerd version. When fixing that in opencontainers#4370, we discussed to consider doing the same for these variables too (opencontainers#4370 (review)). Let's stop reading them from env vars, as it is very easy to do it by mistake (e.g. compile runc and define a COMMIT env var, not to override the commit shown in `runc --version`) and users that want can still override them if they want to. For example, with: make EXTRA_BUILDTAGS=runc_nodmz Signed-off-by: Rodrigo Campos <[email protected]>
rata
added a commit
to rata/runc
that referenced
this pull request
Aug 15, 2024
We recently switched VERSION to be read from env vars (opencontainers#4270). This broke several projects, as they were building runc and using a `VERSION` env var for, e.g. the containerd version. When fixing that in opencontainers#4370, we discussed to consider doing the same for these variables too (opencontainers#4370 (review)). Let's stop reading them from env vars, as it is very easy to do it by mistake (e.g. compile runc and define a COMMIT env var, not to override the commit shown in `runc --version`) and users that want can still override them if they want to. For example, with: make EXTRA_BUILDTAGS=runc_nodmz Signed-off-by: Rodrigo Campos <[email protected]>
rata
added a commit
to rata/runc
that referenced
this pull request
Aug 15, 2024
We recently switched VERSION to be read from env vars (opencontainers#4270). This broke several projects, as they were building runc and using a `VERSION` env var for, e.g. the containerd version. When fixing that in opencontainers#4370, we discussed to consider doing the same for these variables too (opencontainers#4370 (review)). Let's stop reading them from env vars, as it is very easy to do it by mistake (e.g. compile runc and define a COMMIT env var, not to override the commit shown in `runc --version`) and users that want can still override them if they want to. For example, with: make EXTRA_BUILDTAGS=runc_nodmz Signed-off-by: Rodrigo Campos <[email protected]>
rata
added a commit
to rata/runc
that referenced
this pull request
Aug 19, 2024
This reverts commit 9d9273c. This commit broke the build for several other projects (see comments here: opencontainers#4270, after the merge) and we don't really need this to be able to set the version without changing the file. With this commit reverted, we can still run: make VERSION="1.2.3" and it just works. It doesn't take it from an env variable, but that is what broke all the other projects (VERSION is just too generic as an env var, especially for a project like runc that is embedded in many others). Signed-off-by: Rodrigo Campos <[email protected]> (cherry picked from commit f4cc3d8)
rata
added a commit
to rata/runc
that referenced
this pull request
Aug 24, 2024
We recently switched VERSION to be read from env vars (opencontainers#4270). This broke several projects, as they were building runc and using a `VERSION` env var for, e.g. the containerd version. When fixing that in opencontainers#4370, we discussed to consider doing the same for these variables too (opencontainers#4370 (review)). Let's stop reading them from env vars, as it is very easy to do it by mistake (e.g. compile runc and define a COMMIT env var, not to override the commit shown in `runc --version`) and users that want can still override them if they want to. For example, with: make EXTRA_BUILDTAGS=runc_nodmz Signed-off-by: Rodrigo Campos <[email protected]>
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
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.
This is a backport of #4269.
this allows using a custom version string while building runc without modifying the VERSION file
(cherry picked from commit 9d9273c)