Skip to content
Snippets Groups Projects
Commit 041f2928 authored by inso's avatar inso
Browse files

Squashed commit of the following:

commit 846b6513
Author: inso <insomniak.fr@gmaiL.com>
Date:   Tue Feb 20 15:40:00 2018 +0100

    Fix qt script and

commit 4b152889
Author: inso <insomniak.fr@gmaiL.com>
Date:   Tue Feb 20 14:28:51 2018 +0100

    Fix ci
parent a78a4d4e
No related branches found
No related tags found
No related merge requests found
......@@ -11,7 +11,7 @@ environment:
PYTHON_ARCH: "64"
CONDA_PY: "35"
CONDA_NPY: "18"
QTDIR: "C:\\Qt\\5.6\\msvc2015_64"
QTDIR: "C:\\Qt\\5.9\\msvc2015_64"
platform: x64
- PYTHON: "C:\\Python35_32"
......@@ -19,7 +19,7 @@ environment:
PYTHON_ARCH: "32"
CONDA_PY: "35"
CONDA_NPY: "18"
QTDIR: "C:\\Qt\\5.6\\msvc2015"
QTDIR: "C:\\Qt\\5.9\\msvc2015"
platform: x86
install:
......
......@@ -29,9 +29,9 @@ then
freeglut3-dev libfreetype6-dev xorg-dev xserver-xorg-input-void xserver-xorg-video-dummy xpra libosmesa6-dev \
curl libdbus-1-dev libdbus-glib-1-dev autoconf automake libtool libgstreamer-plugins-base0.10-0 dunst fakeroot \
dbus-x11
wget https://download.qt.io/official_releases/qt/5.8/5.8.0/qt-opensource-linux-x64-5.8.0.run
chmod +x qt-opensource-linux-x64-5.8.0.run
./qt-opensource-linux-x64-5.8.0.run --script $HOME/build/duniter/sakia/ci/travis/qt-installer-noninteractive.qs
wget https://download.qt.io/official_releases/qt/5.9/5.9.4/qt-opensource-linux-x64-5.9.4.run
chmod +x qt-opensource-linux-x64-5.9.4.run
./qt-opensource-linux-x64-5.9.4.run --script $HOME/build/duniter/sakia/ci/travis/qt-installer-noninteractive.qs
wget http://archive.ubuntu.com/ubuntu/pool/universe/libs/libsodium/libsodium18_1.0.13-1_amd64.deb
sudo dpkg -i libsodium18_1.0.13-1_amd64.deb
......
......@@ -8,7 +8,7 @@ function Controller() {
}
Controller.prototype.WelcomePageCallback = function() {
gui.clickButton(buttons.NextButton);
gui.clickButton(buttons.NextButton, 3000);
}
Controller.prototype.CredentialsPageCallback = function() {
......
......@@ -9,4 +9,4 @@ pytest-asyncio<0.6
pyyaml
aiohttp
async_timeout
PyQt5>=5.5
\ No newline at end of file
PyQt5>=5.9,<5.10
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment