Skip to content
Snippets Groups Projects
Commit bd77ff59 authored by Felix de las Pozas's avatar Felix de las Pozas
Browse files

Merge branch 'gmrv-to-vglab' into 'master'

Change GMRV strings to VG-Lab.

See merge request nsviz/visimpl!93
parents 7737ba0a 087ea35b
No related branches found
No related tags found
No related merge requests found
...@@ -7,9 +7,9 @@ Ubuntu-Optional-Deps: ...@@ -7,9 +7,9 @@ Ubuntu-Optional-Deps:
- module load Qt-5.15.2 - module load Qt-5.15.2
- export APP_VERSION="dev" - export APP_VERSION="dev"
- export APPIMAGES="visimpl stackviz" - export APPIMAGES="visimpl stackviz"
- export APPIMAGE_REPO="gitlabci@vg-lab.es:apps.private" #- export APPIMAGE_REPO="gitlabci@vg-lab.es:apps.private"
- export APPIMAGE_ICON="visimpl/visimpl.png" - export APPIMAGE_ICON="visimpl/visimpl.png"
- export DOCKER_REPO="gitlabci@vg-lab.es:apps.private" #- export DOCKER_REPO="gitlabci@vg-lab.es:apps.private"
- export CMAKE_EXTRA_TARGETS="install" - export CMAKE_EXTRA_TARGETS="install"
- export CMAKE_EXTRA_ARGS="-DCLONE_SUBPROJECTS=ON -DVISIMPL_OPTIONALS_AS_REQUIRED=ON -DSIMIL_BRION_ENABLED=ON -DSIMIL_WITH_REST_API=ON" - export CMAKE_EXTRA_ARGS="-DCLONE_SUBPROJECTS=ON -DVISIMPL_OPTIONALS_AS_REQUIRED=ON -DSIMIL_BRION_ENABLED=ON -DSIMIL_WITH_REST_API=ON"
- export BUILD_OPTIONALS_SUBPROJECTS=1 - export BUILD_OPTIONALS_SUBPROJECTS=1
...@@ -25,9 +25,9 @@ Ubuntu-Optional-Deps-master-tags: ...@@ -25,9 +25,9 @@ Ubuntu-Optional-Deps-master-tags:
script: script:
- module load Qt-5.15.2 - module load Qt-5.15.2
- export APPIMAGES="visimpl stackviz" - export APPIMAGES="visimpl stackviz"
- export APPIMAGE_REPO="gitlabci@vg-lab.es:apps" #- export APPIMAGE_REPO="gitlabci@vg-lab.es:apps"
- export APPIMAGE_ICON="visimpl/visimpl.png" - export APPIMAGE_ICON="visimpl/visimpl.png"
- export DOCKER_REPO="gitlabci@vg-lab.es:apps.private" #- export DOCKER_REPO="gitlabci@vg-lab.es:apps.private"
- export CMAKE_EXTRA_TARGETS="install" - export CMAKE_EXTRA_TARGETS="install"
- export CMAKE_EXTRA_ARGS="-DCLONE_SUBPROJECTS=ON -DVISIMPL_OPTIONALS_AS_REQUIRED=ON -DSIMIL_BRION_ENABLED=ON -DSIMIL_WITH_REST_API=ON" - export CMAKE_EXTRA_ARGS="-DCLONE_SUBPROJECTS=ON -DVISIMPL_OPTIONALS_AS_REQUIRED=ON -DSIMIL_BRION_ENABLED=ON -DSIMIL_WITH_REST_API=ON"
- export BUILD_OPTIONALS_SUBPROJECTS=1 - export BUILD_OPTIONALS_SUBPROJECTS=1
...@@ -46,9 +46,9 @@ Ubuntu-Optional-Deps-master: ...@@ -46,9 +46,9 @@ Ubuntu-Optional-Deps-master:
- module load Qt-5.15.2 - module load Qt-5.15.2
- export APP_VERSION="git-master" - export APP_VERSION="git-master"
- export APPIMAGES="visimpl stackviz" - export APPIMAGES="visimpl stackviz"
- export APPIMAGE_REPO="gitlabci@vg-lab.es:apps" #- export APPIMAGE_REPO="gitlabci@vg-lab.es:apps"
- export APPIMAGE_ICON="visimpl/visimpl.png" - export APPIMAGE_ICON="visimpl/visimpl.png"
- export DOCKER_REPO="gitlabci@vg-lab.es:apps" #- export DOCKER_REPO="gitlabci@vg-lab.es:apps"
- export CMAKE_EXTRA_TARGETS="install" - export CMAKE_EXTRA_TARGETS="install"
- export CMAKE_EXTRA_ARGS="-DCLONE_SUBPROJECTS=ON -DVISIMPL_OPTIONALS_AS_REQUIRED=ON -DSIMIL_BRION_ENABLED=ON -DSIMIL_WITH_REST_API=ON" - export CMAKE_EXTRA_ARGS="-DCLONE_SUBPROJECTS=ON -DVISIMPL_OPTIONALS_AS_REQUIRED=ON -DSIMIL_BRION_ENABLED=ON -DSIMIL_WITH_REST_API=ON"
- export BUILD_OPTIONALS_SUBPROJECTS=1 - export BUILD_OPTIONALS_SUBPROJECTS=1
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
#git_subproject( Lexis https://github.com/HBPVis/Lexis.git c24dc07 ) #git_subproject( Lexis https://github.com/HBPVis/Lexis.git c24dc07 )
#git_subproject( gmrvlex https://github.com/vg-lab/gmrvlex.git c20b194 ) #git_subproject( gmrvlex https://github.com/vg-lab/gmrvlex.git c20b194 )
#git_subproject( Brion https://github.com/BlueBrain/Brion.git 073f356 ) #git_subproject( Brion https://github.com/BlueBrain/Brion.git 073f356 )
git_subproject( ReTo https://github.com/gmrvvis/ReTo.git bd0c110 ) git_subproject( ReTo https://github.com/vg-lab/ReTo.git bd0c110 )
git_subproject( SimIL https://github.com/gmrvvis/SimIL.git 78f316c0 ) git_subproject( SimIL https://github.com/vg-lab/SimIL.git 78f316c0 )
git_subproject( scoop https://github.com/gmrvvis/scoop.git b3326cd ) git_subproject( scoop https://github.com/vg-lab/scoop.git b3326cd )
git_subproject( plab https://github.com/vg-lab/particlelab.git f7fecd1 ) git_subproject( plab https://github.com/vg-lab/particlelab.git f7fecd1 )
git_subproject( acuterecorder https://github.com/vg-lab/AcuteRecorder.git e17cce7 ) git_subproject( acuterecorder https://github.com/vg-lab/AcuteRecorder.git e17cce7 )
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment