[ci] build x86 and x64 apps on ubuntu 16.04 the same as arm64

Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>

Author: AenBleidd

.github/workflows/linux.yml

@@ -207,15 +207,14 @@ jobs:
     name: ${{ matrix.type }}-build-release
     runs-on: ubuntu-latest
     container:
-      image: ubuntu:13.04
+      image: ubuntu:16.04
     strategy:
       matrix:
-        type: [apps, apps-x86]
+        type: [apps, apps-x86, apps-arm64]
       fail-fast: false
     steps:
       - name: Install dependencies
         run: |
-          sed -i -e 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list
           apt-get -qq update
           apt-get install -y make build-essential m4 pkg-config autoconf libtool git libcurl4-openssl-dev p7zip-full python3
 
@@ -224,13 +223,19 @@ jobs:
         run: |
           apt-get install -y libcurl4-openssl-dev
 
-      - uses: actions/checkout@v1 # ignore-check
+      - name: Install dependencies for arm64
+        if: success() && matrix.type == 'apps-arm64'
+        run: |
+          apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu wget ca-certificates
+
+      - uses: actions/checkout@v3 # ignore-check
         with:
           fetch-depth: 2
 
-      - name: Remove pkg-config dependency
-        run: |
-          git apply remove-pkg-config.patch
+      # - name: Remove pkg-config dependency
+      #   if: success() && matrix.type != 'apps-arm64'
+      #   run: |
+      #     git apply remove-pkg-config.patch
 
       - name: Automake
         if: success()
@@ -263,58 +268,8 @@ jobs:
           ./configure --enable-apps --enable-apps-vbox --disable-server --disable-client --disable-manager --host=i686-linux-gnu
           make -j $(nproc --all)
 
-      - name: Prepare logs on failure
-        if: ${{ failure() }}
-        run: python3 ./deploy/prepare_deployment.py logs
-
-      - name: Upload logs on failure
-        if: ${{ failure() }}
-        uses: actions/upload-artifact@v1 # ignore-check
-        with:
-          name: linux_release_logs_${{ matrix.type }}_${{ github.event.pull_request.head.sha }}
-          path: deploy/logs.7z
-
-      - name: Prepare artifacts for deploy
-        if: success()
-        run: python3 ./deploy/prepare_deployment.py linux_apps
-
-      - name: Upload wrapper artifacts
-        uses: actions/upload-artifact@v1 # ignore-check
-        if: success()
-        with:
-          name: linux_release_${{ matrix.type }}_${{ github.event.pull_request.head.sha }}
-          path: deploy/linux_apps.7z
-
-  build-release-arm64:
-    name: ${{ matrix.type }}-build-release
-    runs-on: ubuntu-latest
-    container:
-      image: ubuntu:16.04
-    strategy:
-      matrix:
-        type: [apps-arm64]
-      fail-fast: false
-    steps:
-      - name: Install dependencies
-        run: |
-          apt-get -qq update
-          apt-get install -y make build-essential m4 pkg-config autoconf libtool git
-
-      - name: Install dependencies for arm64
-        if: success()
-        run: |
-          apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu wget ca-certificates p7zip-full python3
-
-      - uses: actions/checkout@v3 # ignore-check
-        with:
-          fetch-depth: 2
-
-      - name: Automake
-        if: success()
-        run: ./_autosetup
-
-      - name: Build apps for arm64
-        if: success()
+      - name: Make arm64 apps
+        if: success() && matrix.type == 'apps-arm64'
         run: |
           export CI=yes
           export RELEASE=yes