diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-09-19 15:12:58 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-09-19 19:26:56 -0700 |
| commit | d73e0a0fb4028ea967ce24a162328853dd248dac (patch) | |
| tree | 9ebe4c77b09d1fe36e2b1eecf81d7123cd70e653 /.github | |
| parent | 780cb4fce75b0014485e62d628f9b94bcaae4f8f (diff) | |
| download | subsurface-d73e0a0fb4028ea967ce24a162328853dd248dac.tar.gz | |
build-system/packaging: add bluez dependency for Linux builds
I hope this captures all the variations
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/linux-bionic-5.9.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/linux-eoan-5.12.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/scripts/linux-in-container-build.sh | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/.github/workflows/linux-bionic-5.9.yml b/.github/workflows/linux-bionic-5.9.yml index 85241b3a2..bdfb71600 100644 --- a/.github/workflows/linux-bionic-5.9.yml +++ b/.github/workflows/linux-bionic-5.9.yml @@ -29,7 +29,7 @@ jobs: qml-module-qtquick2 qt5-default qt5-qmake qtchooser qtconnectivity5-dev \ qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \ qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools \ - qtquickcontrols2-5-dev xvfb + qtquickcontrols2-5-dev xvfb libbluetooth-dev - name: build Subsurface run: | diff --git a/.github/workflows/linux-eoan-5.12.yml b/.github/workflows/linux-eoan-5.12.yml index 50c446f91..68be79ce3 100644 --- a/.github/workflows/linux-eoan-5.12.yml +++ b/.github/workflows/linux-eoan-5.12.yml @@ -33,7 +33,7 @@ jobs: qml-module-qtquick2 qt5-default qt5-qmake qtchooser qtconnectivity5-dev \ qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \ qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools \ - qtquickcontrols2-5-dev xvfb + qtquickcontrols2-5-dev xvfb libbluetooth-dev - name: build Subsurface-mobile run: | diff --git a/.github/workflows/scripts/linux-in-container-build.sh b/.github/workflows/scripts/linux-in-container-build.sh index 11897fbd6..2316a0ced 100644 --- a/.github/workflows/scripts/linux-in-container-build.sh +++ b/.github/workflows/scripts/linux-in-container-build.sh @@ -10,6 +10,10 @@ export PATH=$QT_ROOT/bin:$PATH # Make sure correct qmake is found on the $PATH f export CMAKE_PREFIX_PATH=$QT_ROOT/lib/cmake export Grantlee5_ROOT=/__w/subsurface/subsurface/install-root +echo "--------------------------------------------------------------" +echo "install missing packages" +apt install -y libbluetooth-dev + # the container currently has things under / that need to be under /__w/subsurface/subsurface instead cp -a /appdir /__w/subsurface/ cp -a /install-root /__w/subsurface/ |