Merge branch 'main' into upgrade_curl_to_8_1_1

.github/workflows/build-and-test-make.yml

@@ -33,6 +33,11 @@ jobs:
             host: aarch64-linux-gnu
             capture_interface: eth0
             make: make
+          - os: ubuntu-20.04
+            arch: arm
+            host: arm-linux-gnueabihf
+            capture_interface: eth0
+            make: make
           - os: macos-11
             arch: x86_64
             host: x86_64-macos
@@ -55,10 +60,10 @@ jobs:
           # More dependencies for the tests
           sudo apt-get install tcpdump nghttp2-server libnss3
 
-      - name: Install Ubuntu dependencies (aarch64)
-        if: matrix.arch == 'aarch64'
+      - name: Install Ubuntu cross-compile dependencies (${{ matrix.arch }})
+        if: matrix.os == 'ubuntu-20.04' && matrix.arch != 'x86_64'
         run: |
-          sudo apt-get install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
+          sudo apt-get install gcc-${{ matrix.host }} g++-${{ matrix.host }}
 
       - name: Install macOS dependencies
         if: matrix.os == 'macos-11'
@@ -177,7 +182,7 @@ jobs:
           ${{ matrix.make }} firefox-build
           ${{ matrix.make }} firefox-checkbuild
           ${{ matrix.make }} firefox-install
-    
+
       - name: Prepare the tests
         if: matrix.arch == 'x86_64'
         run: |
@@ -250,4 +255,4 @@ jobs:
         with:
           files: |
               ${{ env.release_file_lib }}
-              ${{ env.release_file_bin }}
+              ${{ env.release_file_bin }}