Skip to content
Snippets Groups Projects
Verified Commit 5f3e970b authored by Timm Fitschen's avatar Timm Fitschen
Browse files

Merge branch 'dev' of gitlab.indiscale.com:caosdb/src/caosdb-mysqlbackend into dev

parents 800c1dd0 9e69a02f
No related branches found
No related tags found
No related merge requests found
Pipeline #5425 passed
Stage: test
Stage: deploy
Hide whitespace changes
Inline Side-by-side
Showing
with 8 additions and 3 deletions
.gitlab-ci.yml
+ 8
− 3
View file @ 5f3e970b
...@@ -23,7 +23,7 @@ services: ...@@ -23,7 +23,7 @@ services:
- mariadb:10.4 - mariadb:10.4
variables: variables:
DEPLOY_REF: dev DEPLOY_REF: dev
CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb/caosdb-mysqlbackend/testenv:latest CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb/src/caosdb-mysqlbackend/testenv:latest
MYSQL_ROOT_PASSWORD: caosdb1234 MYSQL_ROOT_PASSWORD: caosdb1234
image: $CI_REGISTRY_IMAGE image: $CI_REGISTRY_IMAGE
...@@ -38,7 +38,7 @@ trigger_build: ...@@ -38,7 +38,7 @@ trigger_build:
stage: deploy stage: deploy
script: script:
- /usr/bin/curl -X POST - /usr/bin/curl -X POST
-F token=$DEPLOY_TRIGGER_TOKEN -F token=$CI_JOB_TOKEN
-F "variables[F_BRANCH]=$CI_COMMIT_REF_NAME" -F "variables[F_BRANCH]=$CI_COMMIT_REF_NAME"
-F "variables[MYSQLBACKEND]=$CI_COMMIT_REF_NAME" -F "variables[MYSQLBACKEND]=$CI_COMMIT_REF_NAME"
-F "variables[TriggerdBy]=MYSQLBACKEND" -F "variables[TriggerdBy]=MYSQLBACKEND"
...@@ -84,7 +84,12 @@ pages: ...@@ -84,7 +84,12 @@ pages:
tags: [ docker ] tags: [ docker ]
stage: deploy stage: deploy
only: only:
- dev refs:
- /^release-.*$/i
- master
variables:
# run pages only on gitlab.com
- $CI_SERVER_HOST == "gitlab.com"
script: script:
- echo "Deploying" - echo "Deploying"
- cat doc/index.rst - cat doc/index.rst
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment