Skip to content

Commit

Permalink
Merge branch 'master' into use-kvm-in-test
Browse files Browse the repository at this point in the history
  • Loading branch information
jimmykarily authored Jan 29, 2025
2 parents 0e4b781 + c1c32d4 commit 82ce386
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
14 changes: 13 additions & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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("^(?<major>[0-9]+)\\.(?<minor>[0-9]+)\\.(?<patch>[0-9]+)(-(?<pre>.*))?$") |
{
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)
Expand Down
2 changes: 1 addition & 1 deletion Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 82ce386

Please sign in to comment.