Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
lib4neuro
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
MolDyn
lib4neuro
Commits
6a9dcebe
Commit
6a9dcebe
authored
6 years ago
by
Martin Beseda
Browse files
Options
Downloads
Patches
Plain Diff
FIX: Trying to fix CI...
parent
e55e592d
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+67
-70
67 additions, 70 deletions
.gitlab-ci.yml
build_scripts/linux/linux_gcc_build_x64_debug_system.sh
+2
-2
2 additions, 2 deletions
build_scripts/linux/linux_gcc_build_x64_debug_system.sh
with
69 additions
and
72 deletions
.gitlab-ci.yml
+
67
−
70
View file @
6a9dcebe
# Windows 10 with Boost, Exprtk and Turtle
# downloaded and compiled locally as
# submodules and linked statically
win_visual_studio_static_local_deps
:
tags
:
-
Win
before_script
:
-
call VsDevCmd.bat
-
cd build_scripts\windows
-
call win_download_dependencies.bat
-
cd ..\..
-
cd build_scripts\windows
-
set DEPENDENCIES_LINK_TYPE=static
-
set clean_after=yes
-
call win_VS_build_x64_debug.bat || exit /b
1
script
:
-
cd ..\..
-
cd build_scripts\windows
# - call win_run_tests.bat
-
cd ..\..
#
win_visual_studio_static_local_deps:
#
tags:
#
- Win
#
#
before_script:
#
- call VsDevCmd.bat
#
- cd build_scripts\windows
#
- call win_download_dependencies.bat
#
- cd ..\..
#
- cd build_scripts\windows
#
- set DEPENDENCIES_LINK_TYPE=static
#
- set clean_after=yes
#
- call win_VS_build_x64_debug.bat || exit /b 1
#
#
script:
#
- cd ..\..
#
- cd build_scripts\windows
#
# - call win_run_tests.bat
#
- cd ..\..
# Windows 10 with Boost, Exprtk and Turtle
# downloaded and compiled locally as
...
...
@@ -72,14 +72,11 @@ ubuntu_boost_system:
image
:
martinbeseda/ubuntu-ci:latest
before_script
:
-
rm -rf external_dependencies/boost/*
-
rm -rf external_dependencies/exprtk/*
-
rm -rf exprtk
-
export TERM=xterm
-
cd build_scripts/linux
-
export DEPENDENCIES_LINK_TYPE=shared
-
export CLEAN_AFTER=yes
-
./linux_gcc_build_x64_debug_system.sh
|| exit
1
-
./linux_gcc_build_x64_debug_system.sh
script
:
-
cd ../..
...
...
@@ -90,53 +87,53 @@ ubuntu_boost_system:
# Latest Ubuntu with Boost, Exprtk and Turtle
# compiled locally as submodules and
# linked statically
ubuntu_boost_local_static_deps
:
tags
:
-
centos7
image
:
martinbeseda/DockerTest:latest
before_script
:
-
export TERM=xterm
-
cd build_scripts/linux
-
./download_dependencies.sh
-
cd ../..
-
cd build_scripts/linux
-
export DEPENDENCIES_LINK_TYPE=static
-
export CLEAN_AFTER=yes
-
./linux_gcc_build_x64_debug_local.sh || exit
1
script
:
-
cd ../..
-
cd build_scripts/linux
# - './linux_run_tests.sh'
-
cd ../..
# Latest Ubuntu with Boost, Exprtk and Turtle
# compiled locally as submodules and
# linked dynamically
ubuntu_boost_local_dynamic_deps
:
tags
:
-
centos7
image
:
martinbeseda/ubuntu-ci:latest
before_script
:
-
export TERM=xterm
-
cd build_scripts/linux
-
./download_dependencies.sh
-
cd ../..
-
cd build_scripts/linux
-
export DEPENDENCIES_LINK_TYPE=shared
-
export CLEAN_AFTER=yes
-
./linux_gcc_build_x64_debug_local.sh || exit
1
script
:
-
cd ../..
-
cd build_scripts/linux
# - './linux_run_tests.sh'
-
cd ../..
#
ubuntu_boost_local_static_deps:
#
tags:
#
- centos7
#
#
image: martinbeseda/DockerTest:latest
#
#
before_script:
#
- export TERM=xterm
#
- cd build_scripts/linux
#
- ./download_dependencies.sh
#
- cd ../..
#
- cd build_scripts/linux
#
- export DEPENDENCIES_LINK_TYPE=static
#
- export CLEAN_AFTER=yes
#
- ./linux_gcc_build_x64_debug_local.sh || exit 1
#
#
script:
#
- cd ../..
#
- cd build_scripts/linux
#
# - './linux_run_tests.sh'
#
- cd ../..
#
#
# Latest Ubuntu with Boost, Exprtk and Turtle
#
# compiled locally as submodules and
#
# linked dynamically
#
ubuntu_boost_local_dynamic_deps:
#
tags:
#
- centos7
#
#
image: martinbeseda/ubuntu-ci:latest
#
#
before_script:
#
- export TERM=xterm
#
- cd build_scripts/linux
#
- ./download_dependencies.sh
#
- cd ../..
#
- cd build_scripts/linux
#
- export DEPENDENCIES_LINK_TYPE=shared
#
- export CLEAN_AFTER=yes
#
- ./linux_gcc_build_x64_debug_local.sh || exit 1
#
#
script:
#
- cd ../..
#
- cd build_scripts/linux
#
# - './linux_run_tests.sh'
#
- cd ../..
#
#code_quality:
# image: docker:stable
...
...
This diff is collapsed.
Click to expand it.
build_scripts/linux/linux_gcc_build_x64_debug_system.sh
+
2
−
2
View file @
6a9dcebe
...
...
@@ -101,7 +101,7 @@ then
cmake
-DCMAKE_VERBOSE_MAKEFILE
:BOOL
=
ON
-DCMAKE_BUILD_TYPE
=
Debug
-DCMAKE_CXX_COMPILER
=
${
CXX_COMPILER
}
-DCMAKE_C_COMPILER
=
${
C_COMPILER
}
-DBOOST_LIBRARYDIR
=
${
BOOST_LIBRARYDIR
}
-DBOOST_INCLUDEDIR
=
${
BOOST_INCLUDEDIR
}
-DBUILD_TESTS
=
${
BUILD_TESTS
}
-DBUILD_EXAMPLES
=
${
BUILD_EXAMPLES
}
-DBUILD_LIB
=
${
BUILD_LIB
}
-DLIB4NEURO_DIR
=
${
PWD
}
/build/lib
-DDEPENDENCIES_LINK_TYPE
=
${
LINK_TYPE
}
-DLIB4NEURO_INCLUDE_DIR
=
${
LIB4NEURO_INCLUDE_DIR
}
.
||
(
echo
"
${
RED
}
Makefile preparation finished with errors
${
NC
}
!"
;
BUILD_ERROR_OCCURED
=
1
;
)
if
[
${
BUILD_ERROR_OCCURED
}
=
"0"
]
if
[
${
BUILD_ERROR_OCCURED
}
-eq
0
]
then
echo
"Building the '
${
CYAN
}
lib4neuro
${
NC
}
' project for
${
WHITE
}
Debug
${
NC
}
(building)"
cmake
--build
.
--config
Debug
--
-j
${
N_CORES
}
&&
echo
"
${
GREEN
}
Build complete
${
NC
}
."
||
(
echo
"
${
RED
}
Build finished with errors
${
NC
}
!"
;
BUILD_ERROR_OCCURED
=
1
;
)
...
...
@@ -136,7 +136,7 @@ fi
fi
if
[
${
BUILD_ERROR_OCCURED
}
=
"1"
]
if
[
${
BUILD_ERROR_OCCURED
}
-eq
1
]
then
echo
"
${
RED
}
Build encountered some errors!
${
NC
}
"
exit
1
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment