r23792 by jghali - #16107: Fix the Travis ci

scribus-commit scribus-commit at lists.scribus.net
Tue May 12 18:40:18 UTC 2020


Author: jghali
Date: Tue May 12 18:40:18 2020
New Revision: 23792

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23792
Log:
#16107: Fix the Travis ci

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=23792&path=/trunk/Scribus/.travis.yml
==============================================================================
--- trunk/Scribus/.travis.yml	(original)
+++ trunk/Scribus/.travis.yml	Tue May 12 18:40:18 2020
@@ -1,105 +1,72 @@
-language: c++
+language: cpp
 
-matrix:
-  include:
-    - os: linux
-      dist: xenial
-      sudo: required
-      compiler:
-        - gcc
-    - os: linux
-      dist: xenial
-      sudo: required
-      compiler:
-        - clang
-    - os: osx
-      compiler: clang
-  exclude:
-    - os: osx
-      compiler: gcc
-    - os: linux
-      dist: precise
-    - os: linux
-      dist: trusty
+os: linux
+      
+dist: focal
+      
+compiler: 
+  - clang
+  - gcc
+  
+env: 
+  - NPROC=2
 
 before_install:
-# Linux
--   if [ $TRAVIS_OS_NAME == linux ]; then
-      sudo apt-add-repository ppa:beineri/opt-qt5.10.1-xenial -y;
-      sudo apt-add-repository ppa:as-bahanta/raqm -y;
-      sudo apt-add-repository ppa:ricotz/testing -y;
-      sudo apt-get update -qq;
-    fi
-# OSX
--   if [ $TRAVIS_OS_NAME == osx ]; then
-      brew update; 
-    fi
+  - sudo apt-add-repository ppa:beineri/opt-qt-5.14.2-focal -y
+  - sudo apt-get update -qq
+      
+install:
+  - sudo apt-get install --force-yes cmake libboost-python-dev libcairo2-dev libcups2-dev libharfbuzz-dev libharfbuzz-icu0 libhunspell-dev libhyphen-dev liblcms2-dev libpng-dev libpodofo-dev libpoppler-dev libpoppler-cpp-dev libtiff-dev libxml2-dev qt514base qt514declarative qt514tools python3-all-dev python3-tk zlib1g-dev libgraphicsmagick++1-dev libopenscenegraph-dev libcdr-dev libmspub-dev libwpg-dev libvisio-dev coreutils binutils poppler-data libpoppler-private-dev libfreehand-dev libpagemaker-dev libqxp-dev libzmf-dev
+      
+script:
+  - source /opt/qt514/bin/qt514-env.sh
+  - cmake . -DCMAKE_INSTALL_PREFIX=/usr -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=0 -DWANT_SVNVERSION=0 -DWANT_GUI_LANG=en_US
+  - make -j"$NPROC"
+  - sudo make install
+  - sudo bash -ex ./AppImage-package/bundle.sh
 
-install:
-# Linux
--   if [ $TRAVIS_OS_NAME == linux ]; then
-      sudo apt-get install --force-yes cmake libboost-python-dev libcairo2-dev libcups2-dev
-      libharfbuzz-dev libharfbuzz-icu0 libhunspell-dev libhyphen-dev liblcms2-dev libpng-dev
-      libpodofo-dev libpoppler-dev libpoppler-cpp-dev libtiff-dev libxml2-dev
-      qt510base qt510declarative qt510tools python3-all-dev python3-tk zlib1g-dev
-      libgraphicsmagick++1-dev libopenscenegraph-dev libcdr-dev libmspub-dev libwpg-dev libvisio-dev 
-      coreutils binutils ;
-#     Build a more recent poppler than Ubuntu Xenial's poppler 0.41.0
-      mkdir deps && pushd deps;
-      sudo apt-get install --force-yes libopenjpeg-dev;
-      wget https://poppler.freedesktop.org/poppler-data-0.4.9.tar.gz && tar -xf poppler-data-0.4.9.tar.gz;
-      pushd poppler-data-0.4.9 && cmake -DCMAKE_BUILD_TYPE=Release && sudo make install && popd;
-      wget https://poppler.freedesktop.org/poppler-0.62.0.tar.xz && tar -xf poppler-0.62.0.tar.xz;
-      pushd poppler-0.62.0 && cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_XPDF_HEADERS=1 && sudo make install && popd;
-      popd;
-    fi
-# OSX
--   if [ $TRAVIS_OS_NAME == osx ]; then 
-      brew outdated cmake --verbose || brew upgrade cmake; 
-      brew tap homebrew/dupes && brew install homebrew/dupes/zlib && brew link --force zlib;
-      brew install icu4c && brew link --force icu4c;
-      brew install xz little-cms2 cairo qt5 hunspell ghostscript graphicsmagick poppler podofo harfbuzz;
-      brew install python3 --with-tcl-tk;
-      brew outdated jpeg --verbose || brew upgrade jpeg;
-      brew outdated libpng --verbose || brew upgrade libpng; 
-      brew outdated libtiff --verbose || brew upgrade libtiff; 
-      brew outdated fontconfig --verbose || brew upgrade fontconfig; 
-      brew install openssl && brew link --force openssl; 
-      brew outdated pkg-config --verbose || brew upgrade pkg-config; 
-      brew outdated boost || brew upgrade boost; 
-      brew outdated freetype || brew upgrade freetype; 
-      brew install librevenge libwpg libvisio libmspub libcdr libpagemaker libfreehand open-scene-graph;
-    fi
-  # - export LDFLAGS+=-L/usr/local/opt/zlib/lib:-L/usr/local/opt/gettext/lib:-L/usr/local/opt/libffi/lib:-L/usr/local/opt/qt5/lib:-L/usr/local/opt/sqlite/lib:-L/usr/local/opt/openssl/lib:-L/usr/local/opt/icu4c/lib
-  # - export CXXFLAGS+=-I/usr/local/opt/zlib/include:-I/usr/local/opt/gettext/include:-I/usr/local/opt/qt5/include:-I/usr/local/opt/sqlite/include:-I/usr/local/opt/openssl/include:-I/usr/local/opt/icu4c/include 
-  
-script:
-  - if [ $TRAVIS_OS_NAME == linux ]; then
-      source /opt/qt510/bin/qt510-env.sh;
-      if [[ $CC == gcc ]]; then
-        export NPROC=8;
-      else
-        export NPROC=1;
-      fi;
-      cmake . -DCMAKE_INSTALL_PREFIX=/usr -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=0 -DWANT_SVNVERSION=0 -DWANT_GUI_LANG=en_US;
-      make -j"$NPROC";
-      make install;
-      bash -ex ./AppImage-package/bundle.sh;
-    fi
+jobs:
+  include:
+    os: osx
+    before_install:
+      - brew update 
+    install:
+      - brew outdated cmake || brew upgrade cmake
+      - brew outdated zlib || brew upgrade zlib
+      - brew outdated icu4c || brew upgrade icu4c
+      - brew outdated xz || brew upgrade xz
+      - brew outdated cairo || brew upgrade cairo
+      - brew outdated qt5 || brew upgrade qt5
+      - brew outdated little-cms2 || brew upgrade little-cms2
+      - brew outdated poppler || brew upgrade poppler
+      - brew outdated python || brew unlink python at 2 && brew upgrade python
+      - brew outdated jpeg || brew upgrade jpeg
+      - brew outdated libpng || brew upgrade libpng
+      - brew outdated libtiff || brew upgrade libtiff
+      - brew outdated fontconfig || brew upgrade fontconfig
+      - brew outdated pkg-config || brew upgrade pkg-config
+      - brew outdated boost || brew upgrade boost
+      - brew outdated freetype || brew upgrade freetype
+      - brew outdated openssl || brew upgrade openssl
+      - brew install hunspell podofo ghostscript graphicsmagick harfbuzz librevenge libwpg libvisio libmspub libcdr libpagemaker libfreehand # open-scene-graph
 
-  - if [ $TRAVIS_OS_NAME = osx -a $CC = clang ]; then
-      cmake . -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_NOOSG=1 -DWANT_DEBUG=0 -DWANT_SVNVERSION=0 -DWANT_GUI_LANG=en_US -DWANT_NOEXAMPLES=1 -DWANT_NOTEMPLATES=1 -DCMAKE_PREFIX_PATH=/usr/local/opt/zlib -DBUILD_OSX_BUNDLE=1 -DCMAKE_OSX_ARCHITECTURES="x86_64" -DQT_PREFIX=/usr/local/opt/qt5 -DCMAKE_INSTALL_PREFIX=~/.local;
-      make -j8;
-      make install;
-    fi
+    before_script:
+      - export PKG_CONFIG_PATH="$(pkg-config --variable pc_path pkg-config):/usr/local/opt/openssl/lib/pkgconfig:/usr/local/opt/qt/lib/pkgconfig:/usr/local/opt/icu4c/lib/pkgconfig"
+      - export LDFLAGS="-L/usr/local/opt/zlib/lib -L/usr/local/opt/gettext/lib -L/usr/local/opt/libffi/lib -L/usr/local/opt/qt/lib -L/usr/local/opt/sqlite/lib -L/usr/local/opt/openssl/lib -L/usr/local/opt/icu4c/lib -L/usr/local/opt/hunspell/lib"
+      - export CXXFLAGS="-I/usr/local/opt/zlib/include -I/usr/local/opt/gettext/include -I/usr/local/opt/qt5/include -I/usr/local/opt/sqlite/include -I/usr/local/opt/openssl/include -I/usr/local/opt/icu4c/include -I/usr/local/opt/hunspell/include"
+
+    script:
+      - cmake . -DCMAKE_INSTALL_PREFIX=~/.local -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=0 -DWANT_SVNVERSION=0 -DWANT_GUI_LANG=en_US -DWANT_NOOSG=1 -DBUILD_OSX_BUNDLE=1 -DCMAKE_OSX_ARCHITECTURES=x86_64 -DQT_PREFIX=/usr/local/opt/qt
+      - make -j"$NPROC"
+      - make install
+
 
 notifications:
   irc:
     channels:
-    -  "chat.freenode.net#scribus"
-    -  "chat.freenode.net#scribus-dev"
+#    -  "chat.freenode.net#scribus"
+#    -  "chat.freenode.net#scribus-dev"
     template:
     - "%{repository}/%{branch} (%{author}): %{build_url}: %{message}"
     on_success: always
     on_failure: always
-

Modified: trunk/Scribus/AppImage-package/bundle.sh
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23792&path=/trunk/Scribus/AppImage-package/bundle.sh
==============================================================================
--- trunk/Scribus/AppImage-package/bundle.sh	(original)
+++ trunk/Scribus/AppImage-package/bundle.sh	Tue May 12 18:40:18 2020
@@ -73,7 +73,7 @@
 cp /etc/fonts/fonts.conf etc/fonts/
 
 # Bundle Python
-apt-get download python3.6 python3.6-minimal libpython3.6-minimal libpython3.6-stdlib python3-tk
+apt-get download python3.8 python3.8-minimal libpython3.8-minimal libpython3.8-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.6 \
-                                               -executable=appdir/usr/lib/python3.6/lib-dynload/_tkinter.cpython-36m-x86_64-linux-gnu.so \
+                                               -executable=appdir/usr/bin/python3.8 \
+                                               -executable=appdir/usr/lib/python3.8/lib-dynload/_tkinter.cpython-38-x86_64-linux-gnu.so \
                                                -extra-plugins=platformthemes/libqgtk2.so,styles/libqgtk2style.so




More information about the scribus-commit mailing list