1999 - Update repositories and adapt /etc/os-release to versioneer #2081
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
jimmykarily
changed the title
jimmykarily
changed the title
jimmykarily
force-pushed
the
1999-update-repositories-and-fix-osrelease
branch
from
153dac8 to
e1a540f
Compare
Itxaka
reviewed
Dec 19, 2023
Earthfile
Outdated
| ARG --required VARIANT | ||
| ARG --required MODEL | ||
| ARG --required BASE_IMAGE | ||
| # Uncomment if ISO_NAME is needed (the code that uses it is commented out below) |
There was a problem hiding this comment.
not needed anymore, we used to provide the full anme for the artifacts but we do that later in other target 👍
Itxaka
reviewed
Dec 19, 2023
| @@ -430,8 +419,8 @@ uki: | |||
| # Copy uki artifacts into local build dir | |||
| uki-local-artifacts: | |||
| FROM +uki | |||
| COPY +version/VERSION ./ | |||
| ARG VERSION=$(cat VERSION) | |||
| COPY +git-version/GIT_VERSION ./ | |||
There was a problem hiding this comment.
what is GIT_VERSION ? does that match the old VERSION?
There was a problem hiding this comment.
GIT_VERSION is just the version of kairos (with no k3s in it). It's just the result of git describe --always --tags --dirty.
Itxaka
reviewed
Dec 19, 2023
Earthfile
Outdated
| ARG --required MODEL | ||
| ARG --required BASE_IMAGE | ||
| # +base-image will be called again by +uki but will be cached. | ||
| # We just use it here to take a shortcut to the artifact name |
jimmykarily
force-pushed
the
1999-update-repositories-and-fix-osrelease
branch
from
f0aa813 to
23bcaa6
Compare
jimmykarily
commented
Dec 19, 2023
jimmykarily
force-pushed
the
1999-update-repositories-and-fix-osrelease
branch
2 times, most recently
from
deba8b8 to
c51c392
Compare
|
I can reproduce this failure locally: https://github.com/kairos-io/kairos/actions/runs/7276077385/job/19825149889?pr=2081 |
For this commit, kairos-agent has to be built from at least 4409a4e Also: - Remove some relics from when we had docs in this repo and when we used to pass a VERSION to the bundle for systemd-sysext (now we use "_ANY") - Simplify earthly targets. They don't need all that input just to construct the artifact name because it's running on the "base-image". The artifact name is already written in the /etc/os-release file. - Remove +version target and convert GIT_VERSION to a normal target because when you call `DO +foo` in a target and "foo" has "FROM myimage" in it, after the call, your target now runs on "myimage". - Remove "VERSION" instances from most places, except in reusable-build-flavor which is using it to replace it with "latest" thus the current value (just the kairos version) should work. That workflow is disabled currently but I tried not to break it in case someone re-enables it. Signed-off-by: Dimitris Karakasilis <[email protected]>
Signed-off-by: Dimitris Karakasilis <[email protected]>
Signed-off-by: Mauro Morales <[email protected]>
mauromorales
force-pushed
the
1999-update-repositories-and-fix-osrelease
branch
from
7e05c95 to
5c699ba
Compare
Signed-off-by: Mauro Morales <[email protected]>
mauromorales
approved these changes
Dec 21, 2023
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.
Add missing
/etc/os-releasevariables to work with versioneerFixes #1999
Replaces #2073