uni container version

valord577 · Dec 10, 2024 · 2673a1d · 2673a1d
1 parent aed3e00
commit 2673a1d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/.github/matrix_container.json b/.github/matrix_container.json
@@ -3,35 +3,30 @@
     "platform": "linux",
     "arch": "amd64",
     "pkg_type": "static",
-    "lib_impl": "gnu",
-    "image": "valord577/linux-cross:d62159e85069a9c141b90f1429600183908c0f90"
+    "lib_impl": "gnu"
   },
   {
     "platform": "linux",
     "arch": "arm64",
     "pkg_type": "static",
-    "lib_impl": "gnu",
-    "image": "valord577/linux-cross:d62159e85069a9c141b90f1429600183908c0f90"
+    "lib_impl": "gnu"
   },
   {
     "platform": "linux",
     "arch": "armv7",
     "pkg_type": "static",
-    "lib_impl": "gnueabihf",
-    "image": "valord577/linux-cross:d62159e85069a9c141b90f1429600183908c0f90"
+    "lib_impl": "gnueabihf"
   },
   {
     "platform": "linux",
     "arch": "amd64",
     "pkg_type": "static",
-    "lib_impl": "musl",
-    "image": "valord577/linux-cross:d62159e85069a9c141b90f1429600183908c0f90"
+    "lib_impl": "musl"
   },
   {
     "platform": "linux",
     "arch": "arm64",
     "pkg_type": "static",
-    "lib_impl": "musl",
-    "image": "valord577/linux-cross:d62159e85069a9c141b90f1429600183908c0f90"
+    "lib_impl": "musl"
   }
 ]
diff --git a/.github/workflows/_matrix.yml b/.github/workflows/_matrix.yml
@@ -66,7 +66,10 @@ jobs:
       - name: set matrix container
         id: set-matrix-container
         run: |
+          container_linux="valord577/linux-cross:d62159e85069a9c141b90f1429600183908c0f90"
+
           matrix=$(cat .github/matrix_container.json | jq -c -M "map(. | select($jq_expr) )")
+          matrix=$(echo ${matrix} | jq -c -M "map(if .platform == \"linux\" then . + {image: \"${container_linux}\"} else . end)")
           printf "\e[1m\e[33m%s\e[0m\n" "matrix: $matrix"
           echo "matrix-container={\"include\":$(echo $matrix)}" >> "$GITHUB_OUTPUT"