Use each k3s version only once

Signed-off-by: Dimitris Karakasilis <dimitris@spectrocloud.com>
kairos-io · Sep 8, 2023 · b8b6e87 · b8b6e87
1 parent 536b26d
commit b8b6e87
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/image-arm.yaml b/.github/workflows/image-arm.yaml
@@ -47,7 +47,7 @@ jobs:
           chmod +x luet
           sudo mv luet /usr/bin/luet
           # Construct an array like this from the found versions:
-          sudo luet --config framework-profile.yaml search -o json k8s/k3s  | jq '.packages | map(.version)' >  k3s_versions.json
+          sudo luet --config framework-profile.yaml search -o json k8s/k3s  | jq '.packages | map(.version) | unique' >  k3s_versions.json
           # Create a combination of flavors and k3s versions.
           content=$(jq -s '. | [combinations | .[0] + {"k3s_version": .[1]}] | map(select(.frameworkonly != "true")) | map(select(.standard == "true"))' .github/flavors-arm.json k3s_versions.json)
           # the following lines are only required for multi line json

diff --git a/.github/workflows/release-arm.yaml b/.github/workflows/release-arm.yaml
@@ -39,7 +39,7 @@ jobs:
           chmod +x luet
           sudo mv luet /usr/bin/luet
           # Construct an array like this from the found versions:
-          sudo luet --config framework-profile.yaml search -o json k8s/k3s  | jq '.packages | map(.version)' >  k3s_versions.json
+          sudo luet --config framework-profile.yaml search -o json k8s/k3s  | jq '.packages | map(.version) | unique' >  k3s_versions.json
           # Create a combination of flavors and k3s versions.
           content=$(jq -s '. | [combinations | .[0] + {"k3s_version": .[1]}] | map(select(.frameworkonly != "true")) | map(select(.standard == "true"))' .github/flavors-arm.json k3s_versions.json)
           # the following lines are only required for multi line json

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -44,7 +44,7 @@ jobs:
           chmod +x luet
           sudo mv luet /usr/bin/luet
           # Construct an array like this from the found versions:
-          sudo luet --config framework-profile.yaml search -o json k8s/k3s  | jq '.packages | map(.version)' >  k3s_versions.json
+          sudo luet --config framework-profile.yaml search -o json k8s/k3s  | jq '.packages | map(.version) | unique' >  k3s_versions.json
           content=$(jq -s '. | [combinations | .[0] + {"k3s_version": .[1]}] | map(select(.frameworkonly != "true")) | map(select(.standard == "true"))' .github/flavors.json k3s_versions.json)
           # the following lines are only required for multi line json
           content="${content//'%'/'%25'}"