From f13a318e2a07d2956c5746adf1d25b6336e41a0d Mon Sep 17 00:00:00 2001
From: Andreas Beisler <eb@subdevice.org>
Date: Sun, 3 Jul 2022 11:26:35 +0200
Subject: [PATCH] Change the build image to Ubuntu Bionic for better
 compatibility

---
 .github/workflows/build-and-deploy-release.yml  | 12 ++++++------
 .github/workflows/build-and-deploy-snapshot.yml | 12 ++++++------
 .github/workflows/build-targets.yml             | 12 ++++++------
 build_cmake.sh                                  |  5 ++++-
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/build-and-deploy-release.yml b/.github/workflows/build-and-deploy-release.yml
index 7838a2a6..ee91ef55 100644
--- a/.github/workflows/build-and-deploy-release.yml
+++ b/.github/workflows/build-and-deploy-release.yml
@@ -15,37 +15,37 @@ jobs:
            os: linux
            arch: amd64
            base-image: ubuntu-latest
-           build-image: amd64/debian:testing
+           build-image: amd64/ubuntu:bionic
            ext: ""
          - target: linux-i686
            os: linux
            arch: i686
            base-image: ubuntu-latest
-           build-image: i386/debian:testing
+           build-image: i386/ubuntu:bionic
            ext: ""
          - target: linux-armhf
            os: linux
            arch: armhf
            base-image: ubuntu-latest
-           build-image: arm32v7/debian:testing
+           build-image: arm32v7/ubuntu:bionic
            ext: ""
          - target: linux-aarch64
            os: linux
            arch: aarch64
            base-image: ubuntu-latest
-           build-image: arm64v8/debian:testing
+           build-image: arm64v8/ubuntu:bionic
            ext: ""
          - target: windows-x64
            os: windows
            arch: x64
            base-image: ubuntu-latest
-           build-image: amd64/debian:testing
+           build-image: amd64/ubuntu:bionic
            ext: ".exe"
          - target: windows-x86
            os: windows
            arch: x86
            base-image: ubuntu-latest
-           build-image: i386/debian:testing
+           build-image: i386/ubuntu:bionic
            ext: ".exe"
     steps:
       - name: Checkout
diff --git a/.github/workflows/build-and-deploy-snapshot.yml b/.github/workflows/build-and-deploy-snapshot.yml
index 2db3757b..2bd96a23 100644
--- a/.github/workflows/build-and-deploy-snapshot.yml
+++ b/.github/workflows/build-and-deploy-snapshot.yml
@@ -13,37 +13,37 @@ jobs:
            os: linux
            arch: amd64
            base-image: ubuntu-latest
-           build-image: amd64/debian:testing
+           build-image: amd64/ubuntu:bionic
            ext: ""
          - target: linux-i686
            os: linux
            arch: i686
            base-image: ubuntu-latest
-           build-image: i386/debian:testing
+           build-image: i386/ubuntu:bionic
            ext: ""
          - target: linux-armhf
            os: linux
            arch: armhf
            base-image: ubuntu-latest
-           build-image: arm32v7/debian:testing
+           build-image: arm32v7/ubuntu:bionic
            ext: ""
          - target: linux-aarch64
            os: linux
            arch: aarch64
            base-image: ubuntu-latest
-           build-image: arm64v8/debian:testing
+           build-image: arm64v8/ubuntu:bionic
            ext: ""
          - target: windows-x64
            os: windows
            arch: x64
            base-image: ubuntu-latest
-           build-image: amd64/debian:testing
+           build-image: amd64/ubuntu:bionic
            ext: ".exe"
          - target: windows-x86
            os: windows
            arch: x86
            base-image: ubuntu-latest
-           build-image: i386/debian:testing
+           build-image: i386/ubuntu:bionic
            ext: ".exe"
     steps:
       - name: Checkout
diff --git a/.github/workflows/build-targets.yml b/.github/workflows/build-targets.yml
index 5d999c2b..54618d50 100644
--- a/.github/workflows/build-targets.yml
+++ b/.github/workflows/build-targets.yml
@@ -13,37 +13,37 @@ jobs:
            os: linux
            arch: amd64
            base-image: ubuntu-latest
-           build-image: amd64/debian:testing
+           build-image: amd64/ubuntu:bionic
            ext: ""
          - target: linux-i686
            os: linux
            arch: i686
            base-image: ubuntu-latest
-           build-image: i386/debian:testing
+           build-image: i386/ubuntu:bionic
            ext: ""
          - target: linux-armhf
            os: linux
            arch: armhf
            base-image: ubuntu-latest
-           build-image: arm32v7/debian:testing
+           build-image: arm32v7/ubuntu:bionic
            ext: ""
          - target: linux-aarch64
            os: linux
            arch: aarch64
            base-image: ubuntu-latest
-           build-image: arm64v8/debian:testing
+           build-image: arm64v8/ubuntu:bionic
            ext: ""
          - target: windows-x64
            os: windows
            arch: x64
            base-image: ubuntu-latest
-           build-image: amd64/debian:testing
+           build-image: amd64/ubuntu:bionic
            ext: ".exe"
          - target: windows-x86
            os: windows
            arch: x86
            base-image: ubuntu-latest
-           build-image: i386/debian:testing
+           build-image: i386/ubuntu:bionic
            ext: ".exe"
     steps:
       - name: Checkout
diff --git a/build_cmake.sh b/build_cmake.sh
index eb3d15d8..6315b1c5 100755
--- a/build_cmake.sh
+++ b/build_cmake.sh
@@ -40,11 +40,14 @@ mkdir -p ${BUILDIR}
 # Build platforms one by one.
 for name in "${PLATFORMS[@]}"; do
 	P="${BUILDIR}/$name"
+    S="${PWD}"
 	mkdir -p "${P}"
 	case "${name}" in
 	* ) # Build native library.
-		cmake -B "${P}" -S . ${BUILD} -DCMAKE_TOOLCHAIN_FILE="tools/cross-cmake/${name}.cmake"
+        pushd "${P}"
+		cmake ${BUILD} -DCMAKE_TOOLCHAIN_FILE="tools/cross-cmake/${name}.cmake" "${S}"
 		cmake --build "${P}" ${V}
+        popd
 	;;
 	esac
 done