r23859 by jghali - Revert Travis CI to Bionic as bundle.sh is used also by GitLab

[scribus-commit]

Author: jghali
Date: Sat May 30 16:09:39 2020
New Revision: 23859

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23859
Log:
Revert Travis CI to Bionic as bundle.sh is used also by GitLab

Modified:
    trunk/Scribus/.travis.yml
    trunk/Scribus/AppImage-package/bundle.sh

Modified: trunk/Scribus/.travis.yml
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23859&path=/trunk/Scribus/.travis.yml
==============================================================================
--- trunk/Scribus/.travis.yml	(original)
+++ trunk/Scribus/.travis.yml	Sat May 30 16:09:39 2020
@@ -2,7 +2,7 @@
 
 os: linux
       
-dist: focal
+dist: bionic
       
 compiler: 
   - clang
@@ -12,7 +12,7 @@
   - NPROC=2
 
 before_install:
-  - sudo apt-add-repository ppa:beineri/opt-qt-5.14.2-focal -y
+  - sudo apt-add-repository ppa:beineri/opt-qt-5.14.2-bionic -y
   - sudo apt-get update -qq
       
 install:

Modified: trunk/Scribus/AppImage-package/bundle.sh
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23859&path=/trunk/Scribus/AppImage-package/bundle.sh
==============================================================================
--- trunk/Scribus/AppImage-package/bundle.sh	(original)
+++ trunk/Scribus/AppImage-package/bundle.sh	Sat May 30 16:09:39 2020
@@ -73,7 +73,7 @@
 cp /etc/fonts/fonts.conf etc/fonts/
 
 # Bundle Python
-apt-get download python3.8 python3.8-minimal libpython3.8-minimal libpython3.8-stdlib python3-tk
+apt-get download python3.6 python3.6-minimal libpython3.6-minimal libpython3.6-stdlib python3-tk
 find *.deb -exec dpkg-deb -x {} . \;
 rm *deb
 cd -
@@ -123,6 +123,6 @@
 chmod a+x linuxdeployqt-continuous-x86_64.AppImage
 ARCH=x86_64 VERSION=$SCRIBUS_VERSION ./linuxdeployqt-continuous-x86_64.AppImage --appimage-extract-and-run appdir/usr/share/applications/scribus.desktop \
                                                -appimage -unsupported-bundle-everything \
-                                               -executable=appdir/usr/bin/python3.8 \
-                                               -executable=appdir/usr/lib/python3.8/lib-dynload/_tkinter.cpython-38-x86_64-linux-gnu.so \
+                                               -executable=appdir/usr/bin/python3.6 \
+                                               -executable=appdir/usr/lib/python3.6/lib-dynload/_tkinter.cpython-36m-x86_64-linux-gnu.so \
                                                -extra-plugins=platformthemes/libqgtk2.so,styles/libqgtk2style.so