pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove brew from macosx travis.

Browse source
This commit is contained in:
Martin Rotter 2020-11-27 06:25:13 +01:00
parent 1d1ce833c3
commit de6aab846e
2 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
resources/scripts/.travis-before-install.sh
View file

@ -5,21 +5,6 @@ git fetch --tags
if test "$TRAVIS_OS_NAME" = "osx"; then if test "$TRAVIS_OS_NAME" = "osx"; then
# Mac OS X. # Mac OS X.
pip3 install aqtinstall pip3 install aqtinstall
# Install Qt.
QTPATH="$(pwd)/Qt"
QTVERSION="5.15.2"
QTBIN="$QTPATH/$QTVERSION/clang_64/bin"
echo "Qt bin directory is: $QTBIN"
echo "Qt will be installed to: $QTPATH"
aqt install -O "$QTPATH" 5.15.2 mac desktop clang_64 -m qtwebengine
export QT_PLUGIN_PATH="$QTPATH/$QTVERSION/clang_64/plugins"
export PATH="$QTBIN:$PATH"
qmake --version
elif test "$TRAVIS_OS_NAME" = "linux"; then elif test "$TRAVIS_OS_NAME" = "linux"; then
# Linux. # Linux.
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y

16
resources/scripts/.travis-install-osx.sh
View file

@ -1,5 +1,21 @@
#!/bin/sh #!/bin/sh
# Install Qt. This needs to be done here, because some
# variables need to be set.
QTPATH="$(pwd)/Qt"
QTVERSION="5.15.2"
QTBIN="$QTPATH/$QTVERSION/clang_64/bin"
echo "Qt bin directory is: $QTBIN"
echo "Qt will be installed to: $QTPATH"
aqt install -O "$QTPATH" 5.15.2 mac desktop clang_64 -m qtwebengine
export QT_PLUGIN_PATH="$QTPATH/$QTVERSION/clang_64/plugins"
export PATH="$QTBIN:$PATH"
qmake --version
# Build application. # Build application.
mkdir rssguard-build && cd rssguard-build mkdir rssguard-build && cd rssguard-build
qmake .. "USE_WEBENGINE=$USE_WEBENGINE" qmake .. "USE_WEBENGINE=$USE_WEBENGINE"