Merge pull request #157 from crazy-max/os-update

ci: os update
tonistiigi · Jun 13, 2024 · 638c2d4 · 638c2d4
2 parents 769f2b0 + f4f4003
commit 638c2d4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -35,10 +35,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          -
-            image: alpine:3.15
-            typ: alpine
-            allow-failure: false
           -
             image: alpine:3.16
             typ: alpine
@@ -56,12 +52,12 @@ jobs:
             typ: alpine
             allow-failure: false
           -
-            image: alpine:edge
+            image: alpine:3.20
             typ: alpine
-            allow-failure: true
+            allow-failure: false
           -
-            image: debian:buster-backports
-            typ: debian
+            image: alpine:edge
+            typ: alpine
             allow-failure: true
           -
             image: debian:bullseye-backports
@@ -104,15 +100,19 @@ jobs:
             typ: rhel
             allow-failure: false
           -
-            image: fedora:37
+            image: fedora:38
             typ: rhel
             allow-failure: false
           -
-            image: fedora:38
+            image: fedora:39
             typ: rhel
             allow-failure: false
           -
-            image: fedora:39
+            image: fedora:40
+            typ: rhel
+            allow-failure: false
+          -
+            image: fedora:41
             typ: rhel
             allow-failure: false
           -

diff --git a/src/xx-apk b/src/xx-apk
@@ -46,10 +46,10 @@ setup() {
 
   cp /etc/apk/repositories "$apk_dir/"
 
-  # riscv only supported in edge atm
-  if [ "$TARGETARCH" = "riscv64" ]; then
-    echo "https://dl-cdn.alpinelinux.org/alpine/edge/main" >"$apk_dir/repositories"
-    echo "https://dl-cdn.alpinelinux.org/alpine/edge/community" >>"$apk_dir/repositories"
+  # riscv supported since alpine 3.20
+  if [ "$TARGETARCH" = "riscv64" ] && ! supportRiscV; then
+    echo "https://dl-cdn.alpinelinux.org/alpine/v3.20/main" >"$apk_dir/repositories"
+    echo "https://dl-cdn.alpinelinux.org/alpine/v3.20/community" >>"$apk_dir/repositories"
   fi
   mkdir "$apk_dir/keys"
   mkdir "$apk_dir/protected_paths.d"
@@ -132,6 +132,10 @@ cmd() {
   fi
 }
 
+supportRiscV() {
+  versionGTE "$(xx-info os-version | cut -d'.' -f1-2)" "3.20"
+}
+
 case "$1" in
   "setup")
     setup