From 86b54fb906a772a0705a169b5e67e87b458dfef4 Mon Sep 17 00:00:00 2001
From: Mobin Aydinfar <mobin@mobintestserver.ir>
Date: Mon, 16 Sep 2024 17:30:59 +0330
Subject: [PATCH] CI: Replace Alpine ARM targets with a amd64 one

This is more useful.

Signed-off-by: Mobin Aydinfar <mobin@mobintestserver.ir>
---
 .github/workflows/meson_ci.yml   | 37 ++++++++++++----------------
 .github/workflows/regular_ci.yml | 41 +++++++++++++-------------------
 2 files changed, 32 insertions(+), 46 deletions(-)

diff --git a/.github/workflows/meson_ci.yml b/.github/workflows/meson_ci.yml
index 9af4a22d..b4035ff9 100644
--- a/.github/workflows/meson_ci.yml
+++ b/.github/workflows/meson_ci.yml
@@ -117,35 +117,28 @@ jobs:
     if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' ||
         contains(github.event.pull_request.labels.*.name, 'meson') }}
     runs-on: ubuntu-latest
+    container:
+      image: alpine:latest
     strategy:
       fail-fast: false # Upload src/igr-tests/*/output/* files in igr-tests
       matrix:
         include:
-          - arch: 'armv6'
-          - arch: 'armv7'
-          - arch: 'aarch64'
+          - arch: 'amd64'
 
     steps:
     - uses: actions/checkout@v4
-    - uses: uraimo/run-on-arch-action@v2.7.2
-      name: Getting depends & setup & build & unit & integration tests
-      with:
-        arch: ${{ matrix.arch }}
-        distro: alpine_latest
-        run: |
-          apk add ncurses
-          echo "$(tput bold) !---- ${{ matrix.arch }} BUILD ----!$(tput sgr0)"
-          echo "$(tput bold) ----Getting depends---- :$(tput sgr0) apk update && apk add meson g++ m4"
-          apk update
-          apk add meson g++ m4
-          echo "$(tput bold) ----Setup---- :$(tput sgr0) meson setup -Dunit-tests=true -Digr-tests=true dirbuild"
-          meson setup -Dunit-tests=true -Digr-tests=true dirbuild
-          echo "$(tput bold) ----Build---- :$(tput sgr0) meson compile -C dirbuild"
-          meson compile -C dirbuild
-          echo "$(tput bold) ----Unit tests---- :$(tput sgr0) meson test -v --suite=unit_tests -C dirbuild"
-          meson test -v --suite=unit_tests -C dirbuild
-          echo "$(tput bold) ----Integration tests---- :$(tput sgr0) meson test -v --suite=igr_tests -C dirbuild"
-          meson test -v --suite=igr_tests -C dirbuild
+    - name: Getting depends
+      run: |
+        apk update
+        apk add meson g++ m4
+    - name: Setup
+      run: meson setup -Dunit-tests=true -Digr-tests=true dirbuild
+    - name: Build
+      run: meson compile -C dirbuild
+    - name: Unit tests
+      run: meson test -v --suite=unit_tests -C dirbuild
+    - name: Integration tests
+      run: meson test -v --suite=igr_tests -C dirbuild
     - name: Upload igr-tests output file(s) on failure
       uses: actions/upload-artifact@v4.3.2
       if: failure()
diff --git a/.github/workflows/regular_ci.yml b/.github/workflows/regular_ci.yml
index 9b63875e..059efab8 100644
--- a/.github/workflows/regular_ci.yml
+++ b/.github/workflows/regular_ci.yml
@@ -110,37 +110,30 @@ jobs:
   Alpine-latest_build:
 
     runs-on: ubuntu-20.04
+    container:
+      image: alpine:latest
     strategy:
       fail-fast: false # Upload src/igr-tests/*/output/* files in igr-tests
       matrix:
         include:
-          - arch: 'armv6'
-          - arch: 'armv7'
-          - arch: 'aarch64'
+          - arch: 'amd64'
 
     steps:
     - uses: actions/checkout@v4
-    - uses: uraimo/run-on-arch-action@v2.7.2
-      name: Getting depends & build & unit tests & integration tests
-      with:
-        arch: ${{ matrix.arch }}
-        distro: alpine_latest
-        run: |
-          apk add ncurses
-          echo "$(tput bold) !---- ${{ matrix.arch }} BUILD ----!$(tput sgr0)"
-          echo "$(tput bold) ----Getting depends---- :$(tput sgr0) apk update && apk add make g++ m4 file"
-          apk update
-          apk add make g++ m4 file
-          echo "$(tput bold) ----Print g++ arch---- :$(tput sgr0) g++ -dumpmachine"
-          g++ -dumpmachine
-          echo "$(tput bold) ----Build---- :$(tput sgr0) make"
-          make
-          echo "$(tput bold) ----Print dinit executive file architecture---- :$(tput sgr0) file ./src/dinit"
-          file ./src/dinit
-          echo "$(tput bold) ----Unit tests---- :$(tput sgr0) make check"
-          make check
-          echo "$(tput bold) ----Integration tests---- :$(tput sgr0) make check-igr"
-          make check-igr
+    - name: Getting depends
+      run: |
+        apk update
+        apk add make g++ m4 file
+    - name: Print g++ architecture
+      run: g++ -dumpmachine
+    - name: Build
+      run: make
+    - name: Print dinit executive file architecture
+      run: file ./src/dinit
+    - name: Unit tests
+      run: make check
+    - name: Integration tests
+      run: make check-igr
     - name: Upload igr-tests output file(s) on failure
       uses: actions/upload-artifact@v4.3.2
       if: failure()