Build properly with C++17 support on Ubuntu bionic

nshiell · Aug 16, 2022 · 89cc726 · 89cc726
1 parent 937fde7
commit 89cc726
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/ci/Dockerfile.i386 b/ci/Dockerfile.i386
@@ -25,3 +25,9 @@ ENTRYPOINT ["/entrypoint.sh"]
 ENV APPIMAGE_EXTRACT_AND_RUN=1
 
 ENV DOCKER=1
+
+# this lets us build with proper C++17 support (mostly required so we can use std::filesystem)
+# however, this requires linuxdeploy-plugin-checkrt
+RUN add-apt-repository ppa:ubuntu-toolchain-r/test && \
+    apt-get install -y g++-10
+ENV CXX=g++-10
diff --git a/ci/Dockerfile.x86_64 b/ci/Dockerfile.x86_64
@@ -24,3 +24,12 @@ ENTRYPOINT ["/entrypoint.sh"]
 ENV APPIMAGE_EXTRACT_AND_RUN=1
 
 ENV DOCKER=1
+
+# make sure nlohmann_json can be found
+ENV CMAKE_PREFIX_PATH=/usr/lib/cmake
+
+# this lets us build with proper C++17 support (mostly required so we can use std::filesystem)
+# however, this requires linuxdeploy-plugin-checkrt
+RUN add-apt-repository ppa:ubuntu-toolchain-r/test && \
+    apt-get install -y g++-10
+ENV CXX=g++-10
diff --git a/ci/build-appimages.sh b/ci/build-appimages.sh
@@ -73,9 +73,15 @@ rm -rf {appimageupdatetool,AppImageUpdate}.AppDir/usr/include
 
 
 # get linuxdeploy and its qt plugin
+checkrt_arch="$ARCH"
+if [[ "$checkrt_arch" == "i386" ]]; then
+    checkrt_arch=i686
+fi
+
 wget https://github.com/TheAssassin/linuxdeploy/releases/download/continuous/linuxdeploy-"$ARCH".AppImage
 wget https://github.com/TheAssassin/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-"$ARCH".AppImage
-chmod +x linuxdeploy*.AppImage
+wget https://github.com/linuxdeploy/linuxdeploy-plugin-checkrt/releases/download/continuous/linuxdeploy-plugin-checkrt-"$checkrt_arch".sh
+chmod +x linuxdeploy*.AppImage linuxdeploy-plugin-checkrt*.sh
 
 patch_appimage() {
     while [[ "$1" != "" ]]; do
@@ -97,7 +103,7 @@ for app in appimageupdatetool AppImageUpdate; do
     export OUTPUT="$app"-"$ARCH".AppImage
 
     # bundle application
-    ./linuxdeploy-"$ARCH".AppImage -v0 --appdir "$app".AppDir --output appimage "${EXTRA_FLAGS[@]}" -d "$REPO_ROOT"/resources/"$app".desktop -i "$REPO_ROOT"/resources/appimage.png
+    ./linuxdeploy-"$ARCH".AppImage -v0 --appdir "$app".AppDir --output appimage "${EXTRA_FLAGS[@]}" -d "$REPO_ROOT"/resources/"$app".desktop -i "$REPO_ROOT"/resources/appimage.png --plugin checkrt
 done
 
 # move AppImages to old cwd