From 9c6c6e57e43479fdfe0a0723a0578227bb9c4a2e Mon Sep 17 00:00:00 2001
From: Bensuperpc <bensuperpc@gmail.com>
Date: Tue, 24 Aug 2021 23:54:17 +0200
Subject: [PATCH] Update CI

Updating image lists

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
---
 .github/workflows/main.yml | 79 ++++++++++++++++++++++++++++++--------
 1 file changed, 64 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a5e5808..3c5d5e2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -40,22 +40,71 @@ jobs:
             docker image push dockcross/base --all-tags
 
   image:
-    name: ${{ matrix.arch_name }}
+    name: ${{ matrix.arch_name.image }}
     needs: base
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        arch_name: [android-arm, android-arm64, android-x86, android-x86_64, 
-          linux-arm64, linux-arm64-musl, linux-armv5, linux-armv5-musl, 
-          linux-armv6, linux-armv6-lts, linux-armv6-musl, linux-arm64-full, 
-          linux-armv7, linux-armv7a, linux-armv7l-musl, 
-          linux-x64-clang, linux-s390x, linux-x64, linux-x86, linux-x86_64-full,
-          linux-mips, linux-ppc64le, web-wasm,
-          manylinux2014-x64, manylinux2014-x86, manylinux2014-aarch64,
-          windows-static-x64, windows-static-x64-posix, windows-static-x86, windows-armv7,
-          windows-shared-x64, windows-shared-x64-posix, windows-shared-x86, windows-arm64, 
-          linux-riscv64, linux-riscv32, linux-m68k-uclibc, linux-xtensa-uclibc, linux-x64-tinycc]
+        arch_name:
+        # Android images
+          - { image: "android-arm", arch: "arm" }
+          - { image: "android-arm64", arch: "arm64" }
+          - { image: "android-x86", arch: "x86" }
+          - { image: "android-x86_64", arch: "x86_64" }
+        # Linux arm64/armv8 images
+          - { image: "linux-arm64", arch: "arm64" }
+          - { image: "linux-arm64-musl", arch: "arm64" }
+          - { image: "linux-arm64-full", arch: "arm64" }
+        # Linux armv5 images
+          - { image: "linux-armv5", arch: "armv5" }
+          - { image: "linux-armv5-musl", arch: "armv5" }
+        # Linux armv6 images
+          - { image: "linux-armv6", arch: "armv6" }
+          - { image: "linux-armv6-lts", arch: "armv6" }
+          - { image: "linux-armv6-musl", arch: "armv6" }
+        # Linux armv7 images
+          - { image: "linux-armv7", arch: "armv7" }
+          - { image: "linux-armv7a", arch: "armv7" }
+          - { image: "linux-armv7l-musl", arch: "armv7" }
+        # Linux x86 images
+          - { image: "linux-x86", arch: "x86" }
+        # Linux x86_64 images
+          - { image: "linux-x64", arch: "x86_64" }
+          - { image: "linux-x64-tinycc", arch: "x86_64" }
+          - { image: "linux-x64-clang", arch: "x86_64" }
+          - { image: "linux-x86_64-full", arch: "x86_64" }
+        # Linux riscv images
+          - { image: "linux-riscv32", arch: "riscv32" }
+          - { image: "linux-riscv64", arch: "riscv64" }
+        # Linux s390x images
+          - { image: "linux-s390x", arch: "s390x" }
+        # Linux mips images
+          - { image: "linux-mips", arch: "mips" }
+        # Linux ppc64le images
+          - { image: "linux-ppc64le", arch: "ppc64le" }
+        # Linux m68k images
+          - { image: "linux-m68k-uclibc", arch: "m68k" }
+        # Linux xtensa images
+          - { image: "linux-xtensa-uclibc", arch: "xtensa" }
+        # Windows x86_x64 images
+          - { image: "windows-static-x64", arch: "x86_x64" }
+          - { image: "windows-static-x64-posix", arch: "x86_x64" }
+          - { image: "windows-static-x64", arch: "x86_x64" }
+          - { image: "windows-shared-x64", arch: "x86_x64" }
+          - { image: "windows-shared-x64-posix", arch: "x64" }
+        # Windows x86 images
+          - { image: "windows-static-x86", arch: "x86" }
+          - { image: "windows-shared-x86", arch: "x86" }
+        # Windows arm images
+          - { image: "windows-armv7", arch: "armv7" }
+          - { image: "windows-arm64", arch: "arm64" }
+        # manylinux2014 images
+          - { image: "manylinux2014-x86", arch: "x86" }
+          - { image: "manylinux2014-x64", arch: "x86_64" }
+          - { image: "manylinux2014-aarch64", arch: "arm64" }
+        # web-wasm images
+          - { image: "web-wasm", arch: "JS" }
     steps:
       - uses: actions/checkout@v2
       - uses: actions/download-artifact@v2
@@ -65,11 +114,11 @@ jobs:
       - name: load base
         run: xz -d -k < ./cache/base.tar.xz | docker load
       - name: build
-        run: make ${{ matrix.arch_name }}
-      - name: test
-        run: make ${{ matrix.arch_name }}.test
+        run: make ${{ matrix.arch_name.image }}
+      - name: basic test
+        run: make ${{ matrix.arch_name.image }}.test
       - name: deploy
         if: github.ref == 'refs/heads/master'
         run: |
             docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }}
-            docker image push dockcross/${{ matrix.arch_name }} --all-tags
+            docker image push dockcross/${{ matrix.arch_name.image }} --all-tags