Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
VirtualFluids
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
iRMB
VirtualFluids
Commits
f546bfbb
Commit
f546bfbb
authored
3 years ago
by
schoen
Browse files
Options
Downloads
Plain Diff
Merge branch 'develop' of
https://git.rz.tu-bs.de/irmb/VirtualFluids_dev
into develop
parents
1061b9c9
df73235b
No related branches found
No related tags found
1 merge request
!67
fix initialGridInformations() in GridReader
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+37
-17
37 additions, 17 deletions
.gitlab-ci.yml
README.md
+1
-1
1 addition, 1 deletion
README.md
with
38 additions
and
18 deletions
.gitlab-ci.yml
+
37
−
17
View file @
f546bfbb
image
:
irmb/virtualfluids-python-deps:latest
###############################################################################
## VirtualFluids CI Pipeline ##
###############################################################################
image
:
irmb/virtualfluids-python-deps-ubuntu20.04:latest
stages
:
-
build
...
...
@@ -118,6 +121,8 @@ msvc_16:
gcc_9_python
:
stage
:
build_python
image
:
irmb/virtualfluids-python-deps-ubuntu20.04:latest
needs
:
[
"
gcc_9"
]
cache
:
...
...
@@ -144,6 +149,8 @@ gcc_9_python:
build_singularity_image
:
stage
:
container_upload
image
:
irmb/virtualfluids-python-deps-ubuntu20.04:latest
needs
:
-
gcc_9_python
...
...
@@ -164,6 +171,8 @@ build_singularity_image:
gcc_9_unit_tests
:
stage
:
test
image
:
irmb/virtualfluids-deps-ubuntu20.04:latest
needs
:
[
"
gcc_9"
]
before_script
:
...
...
@@ -194,6 +203,8 @@ msvc_16_unit_tests:
gcc_9_python_bindings_test
:
stage
:
test
image
:
irmb/virtualfluids-python-deps-ubuntu20.04:latest
needs
:
[
"
gcc_9_python"
]
before_script
:
...
...
@@ -209,6 +220,8 @@ gcc_9_python_bindings_test:
gcc_9_python_slurm_test
:
stage
:
test
image
:
irmb/virtualfluids-python-deps-ubuntu20.04:latest
needs
:
[
"
gcc_9_python"
]
rules
:
...
...
@@ -252,14 +265,14 @@ gcc_9_python_slurm_test:
nvidia_test
:
stage
:
benchmark
image
:
nvidia/cuda:11.1.1-devel-ubuntu20.04
needs
:
[]
tags
:
-
gpu
-
linux
image
:
nvidia/cuda:11.1.1-devel-ubuntu20.04
script
:
-
echo NVIDIA_VISIBLE_DEVICES=${NVIDIA_VISIBLE_DEVICES}
-
nvidia-smi
...
...
@@ -381,11 +394,11 @@ include_what_you_use_clang_10:
cppcheck
:
stage
:
analyze
image
:
irmb/virtualfluids-deps-ubuntu20.04
only
:
-
develop@irmb/VirtualFluids_dev
image
:
irmb/virtualfluids-deps-ubuntu20.04
needs
:
[]
before_script
:
...
...
@@ -409,11 +422,11 @@ cppcheck:
lizard
:
stage
:
analyze
image
:
irmb/virtualfluids-python-deps-ubuntu20.04:latest
only
:
-
develop@irmb/VirtualFluids_dev
image
:
irmb/virtualfluids-python-deps-ubuntu20.04
needs
:
[]
before_script
:
...
...
@@ -437,11 +450,11 @@ lizard:
gcov_gcc_9
:
stage
:
analyze
image
:
irmb/virtualfluids-python-deps-ubuntu20.04:latest
only
:
-
develop@irmb/VirtualFluids_dev
image
:
irmb/virtualfluids-python-deps-ubuntu20.04
needs
:
[]
before_script
:
...
...
@@ -481,11 +494,11 @@ gcov_gcc_9:
clang-tidy
:
stage
:
analyze
image
:
irmb/virtualfluids-python-deps-ubuntu20.04:latest
only
:
-
develop@irmb/VirtualFluids_dev
image
:
irmb/virtualfluids-python-deps-ubuntu20.04
needs
:
[]
allow_failure
:
true
...
...
@@ -513,25 +526,24 @@ clang-tidy:
###############################################################################
# doxgen
doxy
ge
n
:
pa
ge
s
:
stage
:
analyze
image
:
alpine
only
:
-
develop@irmb/VirtualFluids_dev
needs
:
[]
image
:
alpine
script
:
-
apk update && apk add doxygen
-
doxygen docs/Doxyfile
-
mv docs/build/html/ public/
artifacts
:
expire_in
:
1
week
expire_in
:
1
hrs
paths
:
-
docs/build/html/
-
public
...
...
@@ -541,6 +553,8 @@ doxygen:
.deploy_template
:
stage
:
deploy
image
:
irmb/virtualfluids-python-deps-ubuntu20.04:latest
before_script
:
-
'
command
-v
ssh-agent
>/dev/null
||
(
apt-get
update
-y
&&
apt-get
install
openssh-client
-y
)'
-
apt-get install -y rsync
...
...
@@ -601,6 +615,9 @@ vf_wheel_to_jupyterhub:
# This job only run on the development branch of the parent repository, not on forks!
sonar-scanner
:
stage
:
deploy
image
:
irmb/virtualfluids-python-deps-ubuntu20.04:latest
tags
:
-
linux
...
...
@@ -633,9 +650,12 @@ sonar-scanner:
## Release ##
###############################################################################
create_release
:
image
:
registry.gitlab.com/gitlab-org/release-cli:latest
stage
:
release
image
:
registry.gitlab.com/gitlab-org/release-cli:latest
needs
:
[
"
build_singularity_image"
]
rules
:
-
if
:
$CI_COMMIT_TAG
...
...
This diff is collapsed.
Click to expand it.
README.md
+
1
−
1
View file @
f546bfbb
...
...
@@ -58,7 +58,7 @@ A GPU computation generates a the time series of output files directly in the ou
## Documentation
The doxygen generated documentation can be found
[
here
](
https://
git.
irmb.
bau.tu-bs.de/doku/CPU
)
.
The doxygen generated documentation can be found
[
here
](
https://irmb.
gitlab-pages.rz.tu-bs.de/VirtualFluids_dev
)
.
## Known Issues
...
...
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