Change the build image to Ubuntu Bionic for better compatibility

QW-Group · Jul 3, 2022 · f13a318 · f13a318
1 parent 50c2056
commit f13a318
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 19 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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