Merge branch 'qt5.15-ubuntu-ci' into 'master'

Enabled Qt-5.15.2 in Ubuntu CI.

See merge request nsviz/NeuroScheme!107

.docker/Dockerfile_nvidia-ubuntu-16.04

@@ -2,7 +2,7 @@ FROM nvidia/opengl:1.0-glvnd-runtime-ubuntu16.04
 
 ENV NVIDIA_DRIVER_CAPABILITIES ${NVIDIA_DRIVER_CAPABILITIES},display
 
-RUN apt-get update && apt-get install -y --no-install-recommends mesa-utils libc6:amd64 libdrm2:amd64 libexpat1:amd64 libffi6:amd64 libfreetype6:amd64 libgcc1:amd64 libgl1-mesa-glx:amd64 libglapi-mesa:amd64 libglib2.0-0:amd64 libgraphite2-3:amd64 libharfbuzz0b:amd64 libice6:amd64 libpcre3:amd64 libsm6:amd64 libstdc++6:amd64 libuuid1:amd64 libx11-6:amd64 libx11-xcb1:amd64 libxau6:amd64 libxcb1:amd64 libxcb-dri2-0:amd64 libxcb-dri3-0:amd64 libxcb-glx0:amd64 libxcb-present0:amd64 libxcb-sync1:amd64 libxdamage1:amd64 libxdmcp6:amd64 libxfixes3:amd64 libxshmfence1:amd64 zlib1g:amd64 libfontconfig1:amd64 xkb-data avahi-daemon avahi-utils libnss-mdns libqt5opengl5 libqt5svg5 libqt5xml5 libboost-system1.58.0 libboost-regex1.58.0 libboost-serialization1.58.0 libboost-iostreams1.58.0 libzmq5 libhwloc5 libhdf5-cpp-11 libfreeimage3 libglew1.13 freeglut3 libxmu6 libxt6 libglu1-mesa-dev libglu1-mesa  && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y --no-install-recommends mesa-utils libc6:amd64 libdrm2:amd64 libexpat1:amd64 libffi6:amd64 libfreetype6:amd64 libgcc1:amd64 libgl1-mesa-glx:amd64 libglapi-mesa:amd64 libglib2.0-0:amd64 libgraphite2-3:amd64 libharfbuzz0b:amd64 libice6:amd64 libpcre3:amd64 libsm6:amd64 libstdc++6:amd64 libuuid1:amd64 libx11-6:amd64 libx11-xcb1:amd64 libxau6:amd64 libxcb1:amd64 libxcb-dri2-0:amd64 libxcb-dri3-0:amd64 libxcb-glx0:amd64 libxcb-present0:amd64 libxcb-sync1:amd64 libxdamage1:amd64 libxdmcp6:amd64 libxfixes3:amd64 libxshmfence1:amd64 zlib1g:amd64 libfontconfig1:amd64 xkb-data avahi-daemon avahi-utils libnss-mdns libboost-system1.58.0 libboost-regex1.58.0 libboost-serialization1.58.0 libboost-iostreams1.58.0 libboost-filesystem1.58.0 libzmq5 libhwloc5 libhdf5-cpp-11 libfreeimage3 libglew1.13 freeglut3 libxmu6 libxt6 libglu1-mesa-dev libglu1-mesa libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-render-util0 libxcb-xinerama0 libxcb-xkb1 libxkbcommon-x11-0 && rm -rf /var/lib/apt/lists/*
 
 COPY avahi-daemon.conf /etc/avahi
 
@@ -10,3 +10,5 @@ COPY install/bin/NeuroScheme /usr/bin/
 COPY install/lib /usr/lib/
 COPY install/include /usr/include/
 COPY install/share /usr/share/
+COPY install/plugins /usr/plugins/
+COPY install/translations /usr/translations/

.docker/Dockerfile_ubuntu-16.04

@@ -2,7 +2,7 @@ FROM ubuntu:16.04
 
 
 
-RUN apt-get update && apt-get install -y --no-install-recommends mesa-utils libc6:amd64 libdrm2:amd64 libexpat1:amd64 libffi6:amd64 libfreetype6:amd64 libgcc1:amd64 libgl1-mesa-glx:amd64 libglapi-mesa:amd64 libglib2.0-0:amd64 libgraphite2-3:amd64 libharfbuzz0b:amd64 libice6:amd64 libpcre3:amd64 libsm6:amd64 libstdc++6:amd64 libuuid1:amd64 libx11-6:amd64 libx11-xcb1:amd64 libxau6:amd64 libxcb1:amd64 libxcb-dri2-0:amd64 libxcb-dri3-0:amd64 libxcb-glx0:amd64 libxcb-present0:amd64 libxcb-sync1:amd64 libxdamage1:amd64 libxdmcp6:amd64 libxfixes3:amd64 libxshmfence1:amd64 zlib1g:amd64 libfontconfig1:amd64 xkb-data avahi-daemon avahi-utils libnss-mdns libqt5opengl5 libqt5svg5 libqt5xml5 libboost-system1.58.0 libboost-regex1.58.0 libboost-serialization1.58.0 libboost-iostreams1.58.0 libzmq5 libhwloc5 libhdf5-cpp-11 libfreeimage3 libglew1.13 freeglut3 libxmu6 libxt6 libglu1-mesa-dev libglu1-mesa  && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y --no-install-recommends mesa-utils libc6:amd64 libdrm2:amd64 libexpat1:amd64 libffi6:amd64 libfreetype6:amd64 libgcc1:amd64 libgl1-mesa-glx:amd64 libglapi-mesa:amd64 libglib2.0-0:amd64 libgraphite2-3:amd64 libharfbuzz0b:amd64 libice6:amd64 libpcre3:amd64 libsm6:amd64 libstdc++6:amd64 libuuid1:amd64 libx11-6:amd64 libx11-xcb1:amd64 libxau6:amd64 libxcb1:amd64 libxcb-dri2-0:amd64 libxcb-dri3-0:amd64 libxcb-glx0:amd64 libxcb-present0:amd64 libxcb-sync1:amd64 libxdamage1:amd64 libxdmcp6:amd64 libxfixes3:amd64 libxshmfence1:amd64 zlib1g:amd64 libfontconfig1:amd64 xkb-data avahi-daemon avahi-utils libnss-mdns libboost-system1.58.0 libboost-regex1.58.0 libboost-serialization1.58.0 libboost-iostreams1.58.0 libboost-filesystem1.58.0 libzmq5 libhwloc5 libhdf5-cpp-11 libfreeimage3 libglew1.13 freeglut3 libxmu6 libxt6 libglu1-mesa-dev libglu1-mesa libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-render-util0 libxcb-xinerama0 libxcb-xkb1 libxkbcommon-x11-0 && rm -rf /var/lib/apt/lists/*
 
 COPY avahi-daemon.conf /etc/avahi
 
@@ -10,3 +10,5 @@ COPY install/bin/NeuroScheme /usr/bin/
 COPY install/lib /usr/lib/
 COPY install/include /usr/include/
 COPY install/share /usr/share/
+COPY install/plugins /usr/plugins/
+COPY install/translations /usr/translations/

.gitlab-ci.yml

@@ -4,6 +4,11 @@ stages:
 Ubuntu-Optional-Deps:
  stage: build
  script:
+  - module load Qt-5.15.2
+  - export APP_VERSION="dev"
+  - export APPIMAGE_REPO="gitlabci@vg-lab.es:apps.private"
+  - export APPIMAGE_ICON="neuroscheme/icons/ns_icon.png"
+  - export DOCKER_REPO="gitlabci@vg-lab.es:apps.private"
   - export CMAKE_EXTRA_TARGETS="install"
   - export BUILD_OPTIONALS_SUBPROJECTS=1
   - export CMAKE_EXTRA_ARGS="-DCLONE_SUBPROJECTS=ON -DNEUROSCHEME_OPTIONALS_AS_REQUIRED=ON -DNEUROSCHEME_NSOL_ENABLED=ON"
@@ -18,9 +23,10 @@ Ubuntu-Optional-Deps:
 Ubuntu-Optional-Deps-master-tags:
  stage: build
  script:
+  - module load Qt-5.15.2
   - export APPIMAGE_REPO="gitlabci@vg-lab.es:apps"
   - export APPIMAGE_ICON="neuroscheme/icons/ns_icon.png"
-  - export DOCKER_REPO="gitlabci@gmrv.es:apps"
+  - export DOCKER_REPO="gitlabci@vg-lab.es:apps"
   - export CMAKE_EXTRA_TARGETS="install"
   - export BUILD_OPTIONALS_SUBPROJECTS=1
   - export CMAKE_EXTRA_ARGS="-DCLONE_SUBPROJECTS=ON -DNEUROSCHEME_OPTIONALS_AS_REQUIRED=ON -DNEUROSCHEME_NSOL_ENABLED=ON"
@@ -36,10 +42,11 @@ Ubuntu-Optional-Deps-master-tags:
 Ubuntu-Optional-Deps-master:
  stage: build
  script:
+  - module load Qt-5.15.2
   - export APP_VERSION="git-master"
   - export APPIMAGE_REPO="gitlabci@vg-lab.es:apps"
   - export APPIMAGE_ICON="neuroscheme/icons/ns_icon.png"
-  - export DOCKER_REPO="gitlabci@gmrv.es:apps"
+  - export DOCKER_REPO="gitlabci@vg-lab.es:apps"
   - export CMAKE_EXTRA_TARGETS="install"
   - export BUILD_OPTIONALS_SUBPROJECTS=1
   - export CMAKE_EXTRA_ARGS="-DCLONE_SUBPROJECTS=ON -DNEUROSCHEME_OPTIONALS_AS_REQUIRED=ON -DNEUROSCHEME_NSOL_ENABLED=ON"
@@ -55,6 +62,7 @@ Ubuntu-Optional-Deps-master:
 Ubuntu-Subproject:
  stage: build
  script:
+  - module load Qt-5.15.2
   - export BUILD_GENERATOR="Ninja"
   - export CMAKE_EXTRA_ARGS="-DCLONE_SUBPROJECTS=ON"
   - bash .gitlab-ci.sh
@@ -66,6 +74,7 @@ Ubuntu-Subproject:
 Ubuntu-Subproject-master:
  stage: build
  script:
+  - module load Qt-5.15.2
   - export CMAKE_EXTRA_ARGS="-DCLONE_SUBPROJECTS=ON"
   - export BUILD_GENERATOR="Ninja"
   - export GITHUB_MIRROR_URL="git@github.com:vg-lab/NeuroScheme"
@@ -114,6 +123,8 @@ OSX-Optional-Deps:
  stage: build
  script:
   - module load Qt-5.9.1
+  - export APP_VERSION="dev"
+  - export DMGAPP_REPO="gitlabci@vg-lab.es:apps.private"
   - export BUILD_OPTIONALS_SUBPROJECTS=1
   - export CMAKE_EXTRA_ARGS="-DNEUROSCHEME_OPTIONALS_AS_REQUIRED=ON -DLibJpegTurbo_INCLUDE_DIR=/usr/local/opt/jpeg-turbo/include -DLibJpegTurbo_LIBRARY=/usr/local/opt/jpeg-turbo/lib/libturbojpeg.dylib -DCLONE_SUBPROJECTS=ON -DNEUROSCHEME_NSOL_ENABLED=ON"
   - export BUILD_GENERATOR="Ninja"
@@ -139,6 +150,8 @@ OSX-Subproject:
 Win7-Subproject-vs14:
   stage: build
   script:
+  - set APP_VERSION=dev
+  - set WINAPP_REPO=gitlabci@vg-lab.es:apps.private
   - call %ENVFILESDIR%\Boost-1.64-vs14-x64.bat
   - call %ENVFILESDIR%\Qt-5.9-vs14.bat
   - call %ENVFILESDIR%\eigen-3.1.2-vs12-x64.bat