Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
CaosDB Octave library
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
caosdb
Software
CaosDB Octave library
Commits
abe59ccf
Verified
Commit
abe59ccf
authored
2 years ago
by
Daniel Hornung
Browse files
Options
Downloads
Patches
Plain Diff
FIX: gitlab-ci now recognizes release branches.
parent
7ccdd987
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Pipeline
#33747
passed
2 years ago
Stage: setup
Stage: test
Stage: deploy
Pipeline: caosdb-octaveinttest
#33748
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
.docker/Dockerfile
+2
-2
2 additions, 2 deletions
.docker/Dockerfile
.gitlab-ci.yml
+6
-0
6 additions, 0 deletions
.gitlab-ci.yml
with
8 additions
and
2 deletions
.docker/Dockerfile
+
2
−
2
View file @
abe59ccf
...
...
@@ -28,5 +28,5 @@ COPY . /caosdb-octavelib
WORKDIR
/caosdb-octavelib
RUN
rm
-rf
.git
RUN
pip3
install
-r
doc/requirements.txt
RUN
pip3
install
-r
dev-requirements.txt
RUN
pip3
install
-U
-r
doc/requirements.txt
RUN
pip3
install
-U
-r
dev-requirements.txt
This diff is collapsed.
Click to expand it.
.gitlab-ci.yml
+
6
−
0
View file @
abe59ccf
...
...
@@ -47,6 +47,12 @@ build-testenv:
image
:
docker:20.10
script
:
-
DOCKER_BASE_IMAGE="${CPPLIB_REGISTRY_IMAGE}"
-
if [[ "${CI_COMMIT_REF_NAME}" == release* ]] ; then
echo "Release detected, choosing cpplib image from 'main' branch." ;
DOCKER_BASE_IMAGE="$CI_REGISTRY/caosdb/src/caosdb-cpplib/testenv:main" ;
else
echo "CI_COMMIT_REF_NAME $CI_COMMIT_REF_NAME" ;
fi
-
docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-
if docker pull "$DOCKER_BASE_IMAGE" ; then
echo "DOCKER_BASE_IMAGE=${DOCKER_BASE_IMAGE}" ;
...
...
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