summaryrefslogtreecommitdiffstats
path: root/.github/workflows
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2020-10-07 12:38:17 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2020-10-08 12:19:39 -0700
commit3371086d2bebe6d23ed67b7a79e81a9140b07b7f (patch)
tree1842d9371c5f9af72a88a36bb54a6f083b4a25fe /.github/workflows
parent7f896ee8d50152e85c6f40ff800c5ad8f9ba4124 (diff)
downloadsubsurface-3371086d2bebe6d23ed67b7a79e81a9140b07b7f.tar.gz
build-system: remove building Grantlee from AppImage build
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/scripts/linux-in-container-build.sh4
1 files changed, 1 insertions, 3 deletions
diff --git a/.github/workflows/scripts/linux-in-container-build.sh b/.github/workflows/scripts/linux-in-container-build.sh
index 2316a0ced..ae09dc90c 100644
--- a/.github/workflows/scripts/linux-in-container-build.sh
+++ b/.github/workflows/scripts/linux-in-container-build.sh
@@ -8,7 +8,6 @@ set -e
export PATH=$QT_ROOT/bin:$PATH # Make sure correct qmake is found on the $PATH for linuxdeployqt
export CMAKE_PREFIX_PATH=$QT_ROOT/lib/cmake
-export Grantlee5_ROOT=/__w/subsurface/subsurface/install-root
echo "--------------------------------------------------------------"
echo "install missing packages"
@@ -40,9 +39,8 @@ export QT_DEBUG_PLUGINS=1
# set up the appdir
mkdir -p appdir/usr/plugins/
-# mv googlemaps and Grantlee plugins into place
+# mv googlemaps plugins into place
mv appdir/usr/usr/local/Qt/5.12.4/gcc_64/plugins/* appdir/usr/plugins # the usr/usr is not a typo, that's where it ends up
-mv appdir/usr/lib/grantlee/ appdir/usr/plugins/
rm -rf appdir/usr/home/ appdir/usr/include/ appdir/usr/share/man/ # No need to ship developer and man files as part of the AppImage
rm -rf appdir/usr/usr appdir/usr/lib/cmake appdir/usr/lib/pkgconfig
cp /ssllibs/libssl.so appdir/usr/lib/libssl.so.1.1