Add armv7 architecture and refactor build workflow

Author: nicodr97

.github/workflows/build.yml

@@ -24,15 +24,15 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        arch: [x86, x86_64, aarch64]
-        cpu_instr: [non-SIMD, SSE2, AVX2, NEON, auto-selected]
+        arch: [x86, x86_64, armv7, aarch64]
+        cpu_instr: [non-SIMD, SSE2, auto-selected]
 
     steps:
       - uses: actions/checkout@v3
         with:
             submodules: true
       - name: Setup Alpine Linux for x86
-        if: matrix.arch == 'x86' && matrix.cpu_instr == 'auto-selected'
+        if: matrix.arch == 'x86'
         uses: jirutka/setup-alpine@v1
         with:
           arch: x86
@@ -42,11 +42,23 @@ jobs:
             g++
             make
           shell-name: alpine-x86.sh
+
       - name: Build trimal for Linux x86
+        if: matrix.arch == 'x86' && matrix.cpu_instr == 'non-SIMD' 
+        run: cmake . -DDISABLE_SSE2=1 -DDISABLE_AVX2=1 && make && file bin/trimal && file bin/readal &&
+          ./scripts/generate_trimmed_msas.sh && ./scripts/compare_trimmed_msas.sh 
+        shell: alpine-x86.sh {0}
+      - name: Build trimal for Linux x86 and SSE2
+        if: matrix.arch == 'x86' && matrix.cpu_instr == 'SSE2' 
+        run: cmake . -DDISABLE_AVX2=1 && make && file bin/trimal && file bin/readal &&
+          ./scripts/generate_trimmed_msas.sh && ./scripts/compare_trimmed_msas.sh 
+        shell: alpine-x86.sh {0}
+      - name: Build trimal for Linux x86 and auto-selected SIMD (AVX2 if available)
         if: matrix.arch == 'x86' && matrix.cpu_instr == 'auto-selected' 
         run: cmake . && make && file bin/trimal && file bin/readal &&
           ./scripts/generate_trimmed_msas.sh && ./scripts/compare_trimmed_msas.sh 
         shell: alpine-x86.sh {0}
+
       - name: Build trimal for Linux x86_64
         if: matrix.arch == 'x86_64' && matrix.cpu_instr == 'non-SIMD' 
         run: cmake . -DDISABLE_SSE2=1 -DDISABLE_AVX2=1 && make && file bin/trimal && file bin/readal &&
@@ -55,17 +67,36 @@ jobs:
         if: matrix.arch == 'x86_64' && matrix.cpu_instr == 'SSE2' 
         run: cmake . -DDISABLE_AVX2=1 && make && file bin/trimal && file bin/readal &&
           ./scripts/generate_trimmed_msas.sh && ./scripts/compare_trimmed_msas.sh
-      - name: Build trimal for Linux x86_64 and AVX2
-        if: matrix.arch == 'x86_64' && matrix.cpu_instr == 'AVX2' 
-        run: cmake . -DDISABLE_SSE2=1 && make && file bin/trimal && file bin/readal &&
-          ./scripts/generate_trimmed_msas.sh && ./scripts/compare_trimmed_msas.sh
-      - name: Build trimal for Linux x86_64 and auto-selected SIMD
+      - name: Build trimal for Linux x86_64 and auto-selected SIMD (AVX2 if available)
         if: matrix.arch == 'x86_64' && matrix.cpu_instr == 'auto-selected' 
         run: cmake . && make && file bin/trimal && file bin/readal &&
           ./scripts/generate_trimmed_msas.sh && ./scripts/compare_trimmed_msas.sh
 
-      - name: Build trimal for Linux aarch64
-        if: matrix.arch == 'aarch64' && matrix.cpu_instr == 'non-SIMD'
+      - name: Setup Alpine Linux for armv7
+        if: matrix.arch == 'armv7'
+        uses: jirutka/setup-alpine@v1
+        with:
+          arch: armv7
+          packages: >
+            cmake
+            file
+            g++
+            make
+          shell-name: alpine-armv7.sh
+
+      - name: Build trimal for Linux armv7 (alpine)
+        if: matrix.arch == 'armv7' && matrix.cpu_instr == 'non-SIMD' 
+        run: cmake . -DDISABLE_SSE2=1 -DDISABLE_AVX2=1 && make && file bin/trimal && file bin/readal &&
+          ./scripts/generate_trimmed_msas.sh && ./scripts/compare_trimmed_msas.sh 
+        shell: alpine-armv7.sh {0}
+      - name: Build trimal for Linux armv7 (alpine) and auto-selected SIMD (NEON)
+        if: matrix.arch == 'armv7' && matrix.cpu_instr == 'auto-selected' 
+        run: cmake . && make && file bin/trimal && file bin/readal &&
+          ./scripts/generate_trimmed_msas.sh && ./scripts/compare_trimmed_msas.sh 
+        shell: alpine-armv7.sh {0}
+
+      - name: Build trimal for Linux armv7 (ubuntu)
+        if: matrix.arch == 'armv7' && matrix.cpu_instr == 'non-SIMD'
         uses: uraimo/run-on-arch-action@v2
         # Emulate ARM architecture since it's not natively supported by GitHub. 
         # Warning about image and host platforms not matching may be ignored (https://github.com/uraimo/run-on-arch-action/issues/127#issuecomment-1605691328)
@@ -79,10 +110,29 @@ jobs:
             apt-get update -q -y
             apt-get install -q -y cmake make g++ file
           run: |
-            cmake . -DDISABLE_NEON=1 -DDISABLE_SSE2=1 -DDISABLE_AVX2=1 && make && file bin/trimal && file bin/readal &&
+            cmake . -DDISABLE_NEON=1 && make && file bin/trimal && file bin/readal &&
             ./scripts/generate_trimmed_msas.sh && ./scripts/compare_trimmed_msas.sh
-      - name: Build trimal for Linux aarch64 and NEON
-        if: matrix.arch == 'aarch64' && matrix.cpu_instr == 'NEON'
+
+      - name: Build trimal for Linux armv7 (ubuntu) and auto-selected SIMD (NEON)
+        if: matrix.arch == 'armv7' && matrix.cpu_instr == 'auto-selected'
+        uses: uraimo/run-on-arch-action@v2
+        # Emulate ARM architecture since it's not natively supported by GitHub. 
+        # Warning about image and host platforms not matching may be ignored (https://github.com/uraimo/run-on-arch-action/issues/127#issuecomment-1605691328)
+        with:
+          arch: ${{ matrix.arch }}
+          distro: ubuntu20.04
+          githubToken: ${{ github.token }}
+          dockerRunArgs: |
+            --volume "${PWD}:/trimal" 
+          install: |
+            apt-get update -q -y
+            apt-get install -q -y cmake make g++ file
+          run: |
+            cmake . && make && file bin/trimal && file bin/readal &&
+            ./scripts/generate_trimmed_msas.sh && ./scripts/compare_trimmed_msas.sh
+
+      - name: Build trimal for Linux aarch64
+        if: matrix.arch == 'aarch64' && matrix.cpu_instr == 'non-SIMD'
         uses: uraimo/run-on-arch-action@v2
         # Emulate ARM architecture since it's not natively supported by GitHub. 
         # Warning about image and host platforms not matching may be ignored (https://github.com/uraimo/run-on-arch-action/issues/127#issuecomment-1605691328)
@@ -96,9 +146,9 @@ jobs:
             apt-get update -q -y
             apt-get install -q -y cmake make g++ file
           run: |
-            cmake . -DDISABLE_SSE2=1 -DDISABLE_AVX2=1 && make && file bin/trimal && file bin/readal &&
+            cmake . -DDISABLE_NEON=1 && make && file bin/trimal && file bin/readal &&
             ./scripts/generate_trimmed_msas.sh && ./scripts/compare_trimmed_msas.sh
-      - name: Build trimal for Linux aarch64 and auto-selected SIMD
+      - name: Build trimal for Linux aarch64 and auto-selected SIMD (NEON)
         if: matrix.arch == 'aarch64' && matrix.cpu_instr == 'auto-selected'
         uses: uraimo/run-on-arch-action@v2
         # Emulate ARM architecture since it's not natively supported by GitHub.