From a38e74b755e2c245d048fc0763a8a2ccbf5d408f Mon Sep 17 00:00:00 2001 From: Dimitris Karakasilis Date: Tue, 28 Jan 2025 16:53:36 +0200 Subject: [PATCH 1/2] Bump auroraboot to build proper ISOs Might fix: https://github.com/kairos-io/kairos/issues/3153 Signed-off-by: Dimitris Karakasilis --- Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Earthfile b/Earthfile index ca08de43f..297c9c4c4 100644 --- a/Earthfile +++ b/Earthfile @@ -10,7 +10,7 @@ ARG GRYPE_VERSION=v0.85.0 # renovate: datasource=docker depName=quay.io/kairos/framework versioning=semver ARG KAIROS_FRAMEWORK_VERSION=v2.15.11 # renovate: datasource=docker depName=quay.io/kairos/auroraboot versioning=semver -ARG AURORABOOT_VERSION=v0.4.3 +ARG AURORABOOT_VERSION=v0.4.4 # renovate: datasource=docker depName=golang versioning=semver ARG GO_VERSION=1.23 # renovate: datasource=docker depName=hadolint/hadolint From c1c32d42ef98f498821f0a935ca02cc4f70f809f Mon Sep 17 00:00:00 2001 From: Dimitris Karakasilis Date: Wed, 29 Jan 2025 09:36:22 +0200 Subject: [PATCH 2/2] Fix k3s selection jq command to handle "-rc2" parts Signed-off-by: Dimitris Karakasilis --- .github/workflows/release.yaml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8317fd7ee..d79eb0474 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -374,7 +374,19 @@ jobs: # Keep maximum k3s version (by semver) # add a "v" in front and a "-k3s1" at the end to match the k3s versioning k3s_version=$(echo '${{ needs.get-standard-matrix.outputs.matrix }}' | \ - jq -r '.include | map(.k3s_version) | unique | max_by(split("+")[0] | split(".") | map(tonumber))' | sed -E 's/\+.*//; s/^/v/; s/$/-k3s1/') + jq -r '.include | map(.k3s_version | split("+")[0]) | unique | + map( + capture("^(?[0-9]+)\\.(?[0-9]+)\\.(?[0-9]+)(-(?
.*))?$") |
+              {
+                major: (.major | tonumber),
+                minor: (.minor | tonumber),
+                patch: (.patch | tonumber),
+                is_stable: (if .pre == null then 1 else 0 end),
+                pre: (.pre // "")
+              }
+            ) | max_by(.major, .minor, .patch, .is_stable, .pre) |
+              "\(.major).\(.minor).\(.patch)\(.pre | if . == "" then "" else "-"+. end)"' | \
+            sed -E 's/^/v/; s/$/-k3s1/')
 
           version=$(git describe --always --tags --dirty)