diff options
| author |  Subsurface CI <dirk@hohndel.org> | 2020-12-27 14:31:39 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-12-29 08:38:36 -0800 |
| commit | 3cf6848605588e6818cf52cb5c14f89925c2b974 (patch) | |
| tree | f685e9b8463b1d60918a18698388cf008041e203 /.github | |
| parent | cdd3adc61b17c2cbced42b6753f141251f12152d (diff) | |
| download | subsurface-3cf6848605588e6818cf52cb5c14f89925c2b974.tar.gz | |
build-system/trusty: use new Qt installer
Update to Qt 5.12.10, latest OpenSSL, add QtChart, add other missing packages.
Also switch to gcc-7 as our statistics code requires better C++17 support than
what gcc-6 can offer.
This then creates trusty-qt512:1.1
Signed-off-by: Subsurface CI <dirk@hohndel.org>
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/linux-trusty-5.12.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/scripts/linux-in-container-build.sh | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/linux-trusty-5.12.yml b/.github/workflows/linux-trusty-5.12.yml index 2142d482c..0aa822dfd 100644 --- a/.github/workflows/linux-trusty-5.12.yml +++ b/.github/workflows/linux-trusty-5.12.yml @@ -11,7 +11,7 @@ jobs: buildAppImage: runs-on: ubuntu-latest container: - image: docker://subsurface/trusty-qt512:1.0 + image: docker://subsurface/trusty-qt512:1.1 steps: - name: checkout sources diff --git a/.github/workflows/scripts/linux-in-container-build.sh b/.github/workflows/scripts/linux-in-container-build.sh index fedf1d6eb..8805057e8 100644 --- a/.github/workflows/scripts/linux-in-container-build.sh +++ b/.github/workflows/scripts/linux-in-container-build.sh @@ -9,9 +9,9 @@ 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 -echo "--------------------------------------------------------------" -echo "install missing packages" -apt install -y libbluetooth-dev libmtp-dev +# echo "--------------------------------------------------------------" +# echo "install missing packages" +# apt install -y libbluetooth-dev libmtp-dev # the container currently has things under / that need to be under /__w/subsurface/subsurface instead cp -a /appdir /__w/subsurface/ @@ -34,7 +34,7 @@ export QT_DEBUG_PLUGINS=1 mkdir -p appdir/usr/plugins/ # 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/usr/local/Qt/5.*/gcc_64/plugins/* appdir/usr/plugins # the usr/usr is not a typo, that's where it ends up 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 |