Merge pull request #5656 from AenBleidd/vko_fix_apps_release_builds

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

.github/workflows/linux.yml

@@ -207,41 +207,41 @@ 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
-
-      - name: Install dependencies for x64
-        if: success() && matrix.type == 'apps'
-        run: |
-          apt-get install -y libcurl4-openssl-dev
-
-      - uses: actions/checkout@v1 # ignore-check
-        with:
-          fetch-depth: 2
-
-      - name: Remove pkg-config dependency
-        run: |
-          git apply remove-pkg-config.patch
-
-      - name: Automake
-        if: success()
-        run: ./_autosetup
+          apt-get install -y make build-essential m4 pkg-config autoconf libtool git p7zip-full python3
 
       - name: Install dependencies for x86
         if: success() && matrix.type == 'apps-x86'
         run: |
           dpkg --add-architecture i386
           apt-get update
-          apt-get install -y gcc-multilib g++-multilib libcurl4-openssl-dev:i386
+          apt-get install -y gcc-multilib g++-multilib libcurl4-openssl-dev:i386 libssl-dev:i386
+
+      - name: Install dependencies for x64
+        if: success() && matrix.type == 'apps'
+        run: |
+          apt-get install -y libcurl4-openssl-dev libssl-dev
+
+      - 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: Automake
+        if: success()
+        run: ./_autosetup
 
       - name: Make x64 apps
         if: success() && matrix.type == 'apps'
@@ -263,58 +263,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

remove-pkg-config.patch

@@ -1,87 +0,0 @@
-diff --git a/api/Makefile.am b/api/Makefile.am
-index 6d13d3dc39..a51859d96d 100644
---- a/api/Makefile.am
-+++ b/api/Makefile.am
-@@ -42,20 +42,20 @@ AM_CXXFLAGS += @GLUT_CFLAGS@
- endif
-
- lib_LTLIBRARIES = libboinc_api.la
--pkgconfig_DATA = libboinc_api.pc
-+## pkgconfig_DATA = libboinc_api.pc
- libboinc_api_la_SOURCES = $(api_files)
- libboinc_api_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
-
- if BUILD_GRAPHICS_API
- lib_LTLIBRARIES += libboinc_graphics2.la
--pkgconfig_DATA += libboinc_graphics2.pc
-+## pkgconfig_DATA += libboinc_graphics2.pc
- libboinc_graphics2_la_SOURCES = $(graphics2_files)
- libboinc_graphics2_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/samples/image_libs
- libboinc_graphics2_la_LDFLAGS = -version-number $(LIBBOINC_VERSION) -ljpeg
- endif #BUILD_GRAPHICS_API
-
- lib_LTLIBRARIES += libboinc_opencl.la
--pkgconfig_DATA += libboinc_opencl.pc
-+## pkgconfig_DATA += libboinc_opencl.pc
- libboinc_opencl_la_SOURCES = $(opencl_files)
- libboinc_opencl_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
-
-diff --git a/configure.ac b/configure.ac
-index 5ea74f247c..78db44401e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -64,8 +64,8 @@ SAH_LINKS
- AC_LANG_PUSH(C)
- AM_PROG_CC_C_O
-
--PKG_PROG_PKG_CONFIG
--PKG_INSTALLDIR
-+dnl PKG_PROG_PKG_CONFIG
-+dnl PKG_INSTALLDIR
-
- m4_divert_once([HELP_ENABLE],
-   AS_HELP_STRING([BOINC Default enable values], [--enable-server --enable-client --enable-libraries --enable-manager: builds server, client, and libraries]))
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index 7cbcf7f000..9178459af4 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -180,7 +180,7 @@ noinst_HEADERS = \
-     unix_util.h
-
- lib_LTLIBRARIES = libboinc.la
--pkgconfig_DATA = libboinc.pc
-+## pkgconfig_DATA = libboinc.pc
- libboinc_la_SOURCES = $(generic_sources) $(mac_sources) $(win_sources)
- libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
- libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
-@@ -192,7 +192,7 @@ libboinc_la_LIBADD =
-
- if ENABLE_BOINCCRYPT
- lib_LTLIBRARIES += libboinc_crypt.la
--pkgconfig_DATA += libboinc_crypt.pc
-+## pkgconfig_DATA += libboinc_crypt.pc
- libboinc_crypt_la_SOURCES = crypt.cpp
- libboinc_crypt_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CFLAGS)
- libboinc_crypt_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CXXFLAGS)
-@@ -202,7 +202,7 @@ endif
-
- if ENABLE_FCGI
- lib_LTLIBRARIES += libboinc_fcgi.la
--pkgconfig_DATA += libboinc_fcgi.pc
-+## pkgconfig_DATA += libboinc_fcgi.pc
- libboinc_fcgi_la_SOURCES = $(libfcgi_sources) $(mac_sources) $(win_sources)
- libboinc_fcgi_la_CFLAGS = -D_USING_FCGI_ $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
- libboinc_fcgi_la_CXXFLAGS = -D_USING_FCGI_ $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
-diff --git a/zip/Makefile.am b/zip/Makefile.am
-index dde17a3fb5..5703274fff 100644
---- a/zip/Makefile.am
-+++ b/zip/Makefile.am
-@@ -60,7 +60,7 @@ libboinc_zip_sources += \
- endif
-
- lib_LTLIBRARIES = libboinc_zip.la
--pkgconfig_DATA = libboinc_zip.pc
-+## pkgconfig_DATA = libboinc_zip.pc
- libboinc_zip_la_SOURCES = $(libboinc_zip_sources)
- libboinc_zip_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
- libboinc_zip_la_LIBADD =