commit f0fda8892472df8c2964bcafe44a27de59ac6782 parent e6cf59dc7f87f01fba1bd139a5c87b35343bdf88 Author: Marcel <MTRNord@users.noreply.github.com> Date: Sat, 10 Mar 2018 22:28:11 +0100 Kill if armhf as it got no qt binary and use provided env var in check Diffstat:
| M | snap/snapcraft.yaml | | | 22 | ++++++++++++---------- |
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml @@ -24,6 +24,7 @@ parts: - xvfb - software-properties-common build: | + test $SNAP_ARCH = 'armhf' && exit 0 add-apt-repository -y ppa:gophers/archive apt-get -qq update apt-get -y -qq install golang-1.9-go @@ -32,17 +33,17 @@ parts: mkdir $GOPATH go get -u -d -v github.com/therecipe/qt/cmd/... export DISPLAY=:0 - test $(uname -i) = 'x86_64' && curl -L --retry 10 --retry-delay 10 -o ./qt-unified-linux-x64-online.run https://download.qt.io/official_releases/online_installers/qt-unified-linux-x64-online.run - test $(uname -i) = 'i386' && curl -L --retry 10 --retry-delay 10 -o ./qt-unified-linux-x86-online.run https://download.qt.io/official_releases/online_installers/qt-unified-linux-x86-online.run + test $SNAP_ARCH = 'x86_64' && curl -L --retry 10 --retry-delay 10 -o ./qt-unified-linux-x64-online.run https://download.qt.io/official_releases/online_installers/qt-unified-linux-x64-online.run + test $SNAP_ARCH = 'i386' && curl -L --retry 10 --retry-delay 10 -o ./qt-unified-linux-x86-online.run https://download.qt.io/official_releases/online_installers/qt-unified-linux-x86-online.run ls -la ./ - test $(uname -i) = 'x86_64' && ls -la ./qt-unified-linux-x64-online.run - test $(uname -i) = 'i386' && ls -la ./qt-unified-linux-x86-online.run - test $(uname -i) = 'x86_64' && chmod +x ./qt-unified-linux-x64-online.run - test $(uname -i) = 'i386' && chmod +x qt-unified-linux-x86-online.run - test $(uname -i) = 'x86_64' && xvfb-run sh ./qt-unified-linux-x64-online.run --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs LINUX=true - test $(uname -i) = 'i386' && xvfb-run sh ./qt-unified-linux-x86-online.run --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs LINUX=true - test $(uname -i) = 'x86_64' && rm -f ./qt-unified-linux-x64-online.run - test $(uname -i) = 'i386' && rm -f ./qt-unified-linux-x86-online.run + test $SNAP_ARCH = 'x86_64' && ls -la ./qt-unified-linux-x64-online.run + test $SNAP_ARCH = 'i386' && ls -la ./qt-unified-linux-x86-online.run + test $SNAP_ARCH = 'x86_64' && chmod +x ./qt-unified-linux-x64-online.run + test $SNAP_ARCH = 'i386' && chmod +x qt-unified-linux-x86-online.run + test $SNAP_ARCH = 'x86_64' && xvfb-run sh ./qt-unified-linux-x64-online.run --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs LINUX=true + test $SNAP_ARCH = 'i386' && xvfb-run sh ./qt-unified-linux-x86-online.run --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs LINUX=true + test $SNAP_ARCH = 'x86_64' && rm -f ./qt-unified-linux-x64-online.run + test $SNAP_ARCH = 'i386' && rm -f ./qt-unified-linux-x86-online.run export PKG_CONFIG_PATH=/opt/qt58/lib/pkgconfig export QT_DOC_DIR=/opt/qt58/doc export QT_MISC_DIR=/opt/qt58 @@ -56,6 +57,7 @@ parts: dep ensure $GOPATH/bin/qtdeploy build linux install: | + test $SNAP_ARCH = 'armhf' && exit 0 mv .circleci/Morpheus.sh $SNAPCRAFT_PART_INSTALL/usr/bin/Morpheus.sh sed -i -e 's/$appname/Morpheus_bin/g' $SNAPCRAFT_PART_INSTALL/usr/bin/Morpheus.sh ln -s $SNAPCRAFT_PART_INSTALL/usr/bin/Morpheus.sh $SNAPCRAFT_PART_INSTALL/usr/bin/Morpheus