Skip to content
Snippets Groups Projects
Verified Commit 0e99ec36 authored by Daniel Hornung's avatar Daniel Hornung
Browse files

FIX: Pipeline should work for f-branches now

parent c6b02f51
No related branches found
No related tags found
1 merge request!30Fix pipeline for f-branches
...@@ -15,7 +15,8 @@ RUN rm -rf .git ...@@ -15,7 +15,8 @@ RUN rm -rf .git
COPY .docker/caosdb-client.json /caosdb-client.json COPY .docker/caosdb-client.json /caosdb-client.json
# build and run tests # Build and run tests.
# If no other command is given to the Docker image
CMD mkdir build && \ CMD mkdir build && \
cd build && \ cd build && \
conan install .. -s "compiler.libcxx=libstdc++11" && \ conan install .. -s "compiler.libcxx=libstdc++11" && \
......
...@@ -78,10 +78,10 @@ build-testenv: &build-testenv ...@@ -78,10 +78,10 @@ build-testenv: &build-testenv
stage: setup stage: setup
timeout: 2h timeout: 2h
needs: [] needs: []
only: # only:
- pipelines # - pipelines
- schedules # - schedules
- web # - web
script: script:
- *env - *env
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment