Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-server
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue 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
caosdb
Software
caosdb-server
Commits
64c238d4
Verified
Commit
64c238d4
authored
2 years ago
by
Timm Fitschen
Browse files
Options
Downloads
Plain Diff
Merge branch 'dev' into f-doc-query
parents
c38d15a8
05379e64
No related branches found
No related tags found
2 merge requests
!96
DOC: Added CITATION.cff to the list of files in the release guide where the...
,
!89
DOC: enhance query documentation
Pipeline
#35624
failed
2 years ago
Stage: info
Stage: setup
Stage: test
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+13
-8
13 additions, 8 deletions
.gitlab-ci.yml
src/test/docker/Dockerfile
+3
-0
3 additions, 0 deletions
src/test/docker/Dockerfile
with
16 additions
and
8 deletions
.gitlab-ci.yml
+
13
−
8
View file @
64c238d4
...
...
@@ -39,6 +39,10 @@ variables:
CPPINT
:
"
"
MYSQLBACKEND
:
"
"
workflow
:
rules
:
-
if
:
$CI_PIPELINE_SOURCE != "merge_request_event" && $CI_COMMIT_REF_NAME != $CI_COMMIT_TAG
image
:
$CI_REGISTRY_IMAGE
stages
:
-
info
...
...
@@ -70,8 +74,11 @@ build-testenv:
image
:
docker:20.10
stage
:
setup
timeout
:
3h
only
:
-
schedules
rules
:
-
if
:
$CI_PIPELINE_SOURCE == "schedule"
-
if
:
$CI_PIPELINE_SOURCE != "schedule"
changes
:
-
src/test/docker/Dockerfile
script
:
-
cd src/test/docker
-
docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
...
...
@@ -136,9 +143,8 @@ trigger_inttest:
pages_prepare
:
&pages_prepare
tags
:
[
cached-dind
]
stage
:
deploy
only
:
refs
:
-
/^release-.*$/i
rules
:
-
if
:
$CI_COMMIT_REF_NAME =~ /^release-.*$/i
script
:
-
echo "Deploying..."
-
make doc
...
...
@@ -148,6 +154,5 @@ pages_prepare: &pages_prepare
-
public
pages
:
<<
:
*pages_prepare
only
:
refs
:
-
main
rules
:
-
if
:
$CI_COMMIT_REF_NAME == 'main'
This diff is collapsed.
Click to expand it.
src/test/docker/Dockerfile
+
3
−
0
View file @
64c238d4
...
...
@@ -3,6 +3,9 @@ RUN apt-get update && \
apt-get
install
-y
\
git make mariadb-server maven openjdk-11-jdk-headless
\
plantuml
\
libtiff5-dev libjpeg-dev libopenjp2-7-dev zlib1g-dev
\
libfreetype6-dev liblcms2-dev libwebp-dev tcl8.6-dev tk8.6-dev python3-tk
\
libharfbuzz-dev libfribidi-dev libxcb1-dev
\
python3-pip screen libpam0g-dev unzip curl shunit2
\
python3-sphinx
...
...
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