Skip to content
Snippets Groups Projects
Commit 4b152889 authored by inso's avatar inso
Browse files

Fix ci

parent a78a4d4e
No related branches found
No related tags found
No related merge requests found
...@@ -11,7 +11,7 @@ environment: ...@@ -11,7 +11,7 @@ environment:
PYTHON_ARCH: "64" PYTHON_ARCH: "64"
CONDA_PY: "35" CONDA_PY: "35"
CONDA_NPY: "18" CONDA_NPY: "18"
QTDIR: "C:\\Qt\\5.6\\msvc2015_64" QTDIR: "C:\\Qt\\5.10.0\\msvc2015_64"
platform: x64 platform: x64
- PYTHON: "C:\\Python35_32" - PYTHON: "C:\\Python35_32"
...@@ -19,7 +19,7 @@ environment: ...@@ -19,7 +19,7 @@ environment:
PYTHON_ARCH: "32" PYTHON_ARCH: "32"
CONDA_PY: "35" CONDA_PY: "35"
CONDA_NPY: "18" CONDA_NPY: "18"
QTDIR: "C:\\Qt\\5.6\\msvc2015" QTDIR: "C:\\Qt\\5.9\\msvc2015"
platform: x86 platform: x86
install: install:
......
...@@ -29,9 +29,9 @@ then ...@@ -29,9 +29,9 @@ then
freeglut3-dev libfreetype6-dev xorg-dev xserver-xorg-input-void xserver-xorg-video-dummy xpra libosmesa6-dev \ 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 \ curl libdbus-1-dev libdbus-glib-1-dev autoconf automake libtool libgstreamer-plugins-base0.10-0 dunst fakeroot \
dbus-x11 dbus-x11
wget https://download.qt.io/official_releases/qt/5.8/5.8.0/qt-opensource-linux-x64-5.8.0.run 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.8.0.run chmod +x qt-opensource-linux-x64-5.9.4.run
./qt-opensource-linux-x64-5.8.0.run --script $HOME/build/duniter/sakia/ci/travis/qt-installer-noninteractive.qs ./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 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 sudo dpkg -i libsodium18_1.0.13-1_amd64.deb
......
...@@ -9,4 +9,4 @@ pytest-asyncio<0.6 ...@@ -9,4 +9,4 @@ pytest-asyncio<0.6
pyyaml pyyaml
aiohttp aiohttp
async_timeout async_timeout
PyQt5>=5.5 PyQt5>=5.9,<5.10
\ No newline at end of file \ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment