From 0e99ec3687037b64edf9952f5f53cefeeee36320 Mon Sep 17 00:00:00 2001
From: Daniel <d.hornung@indiscale.com>
Date: Thu, 5 Oct 2023 11:02:22 +0200
Subject: [PATCH] FIX: Pipeline should work for f-branches now
---
.docker/Dockerfile | 3 ++-
.gitlab-ci.yml | 8 ++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 98f12aa..29e439b 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -15,7 +15,8 @@ RUN rm -rf .git
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 && \
cd build && \
conan install .. -s "compiler.libcxx=libstdc++11" && \
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8027bef..00797c5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,10 +78,10 @@ build-testenv: &build-testenv
stage: setup
timeout: 2h
needs: []
- only:
- - pipelines
- - schedules
- - web
+ # only:
+ # - pipelines
+ # - schedules
+ # - web
script:
- *env
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
--
GitLab