Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • caosdb/src/caosdb-octavelib
1 result
Show changes
Commits on Source (2)
...@@ -27,6 +27,7 @@ variables: ...@@ -27,6 +27,7 @@ variables:
CPPLIB_BRANCH: f-cpp-to-string CPPLIB_BRANCH: f-cpp-to-string
OCTAVEINTTEST_PIPELINE: https://gitlab.indiscale.com/api/v4/projects/121/trigger/pipeline OCTAVEINTTEST_PIPELINE: https://gitlab.indiscale.com/api/v4/projects/121/trigger/pipeline
OCTAVEINTTEST_BRANCHES: https://gitlab.indiscale.com/api/v4/projects/121/repository/branches
image: $OCTAVE_REGISTRY_IMAGE image: $OCTAVE_REGISTRY_IMAGE
...@@ -104,7 +105,11 @@ trigger_inttest: ...@@ -104,7 +105,11 @@ trigger_inttest:
## Determine the octaveinttest branch... ## Determine the octaveinttest branch...
# ... sync'ed f-branch (f-bar on octavelib requires f-bar on octaveinttest)... # ... sync'ed f-branch (f-bar on octavelib requires f-bar on octaveinttest)...
- if echo "$CI_COMMIT_REF_NAME" | grep -c "^f-" ; then - if echo "$CI_COMMIT_REF_NAME" | grep -c "^f-" ; then
OCTAVEINT_REF=$CI_COMMIT_REF_NAME ; if curl -o /dev/null -s -w "%{http_code}" $OCTAVEINTTEST_BRANCHES/$CI_COMMIT_REF_NAME | grep "404"; then
OCTAVEINT_REF=dev ;
else
OCTAVEINT_REF=$CI_COMMIT_REF_NAME ;
fi
fi; fi;
# ... or use main if possible... # ... or use main if possible...
- if [[ "$CI_COMMIT_REF_NAME" == "main" ]] ; then - if [[ "$CI_COMMIT_REF_NAME" == "main" ]] ; then
......