bec/ophyd_devices
0
0
Fork 0
mirror of https://github.com/bec-project/ophyd_devices.git synced 2025-07-09 10:18:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

ci: fix bec_core_branch triggering in ci file

Browse Source
This commit is contained in:
appel_c
2024-05-28 18:06:26 +02:00
parent af908fa210
commit 3cab5690db
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.gitlab-ci.yml
View File

@ -25,7 +25,6 @@ workflow:
auto_cancel: auto_cancel:
on_new_commit: interruptible on_new_commit: interruptible
include: include:
- template: Security/Secret-Detection.gitlab-ci.yml - template: Security/Secret-Detection.gitlab-ci.yml
- project: "bec/awi_utils" - project: "bec/awi_utils"
@ -44,7 +43,7 @@ include:
#commands to run in the Docker container before starting each job. #commands to run in the Docker container before starting each job.
before_script: before_script:
- if [[ "$CI_PROJECT_PATH" != "bec/ophyd_devices" ]]; then - if [[ "$CI_PROJECT_PATH" != "bec/ophyd_devices" ]]; then
echo -e "\033[35;1m Using branch $CHILD_PIPELINE_BRANCH of Ophyd Devices \033[0;m"; echo -e "\033[35;1m Using branch $CHILD_PIPELINE_BRANCH of Ophyd Devices \033[0;m";
test -d ophyd_devices || git clone --branch $CHILD_PIPELINE_BRANCH https://gitlab.psi.ch/bec/ophyd_devices.git; cd ophyd_devices; test -d ophyd_devices || git clone --branch $CHILD_PIPELINE_BRANCH https://gitlab.psi.ch/bec/ophyd_devices.git; cd ophyd_devices;
fi fi
- pip install -e .[dev] - pip install -e .[dev]
@ -159,7 +158,7 @@ config_test:
tests-3.11: tests-3.11:
stage: AdditionalTests stage: AdditionalTests
needs: needs:
- job: "formatter" - job: "formatter"
optional: true optional: true
- job: "pylint" - job: "pylint"
@ -180,6 +179,7 @@ trigger_bec:
trigger: trigger:
project: bec/bec project: bec/bec
strategy: depend strategy: depend
branch: $BEC_CORE_BRANCH
variables: variables:
OPHYD_DEVICES_BRANCH: $CI_COMMIT_REF_NAME OPHYD_DEVICES_BRANCH: $CI_COMMIT_REF_NAME
rules: rules:
@ -190,15 +190,15 @@ trigger:
parallel: parallel:
matrix: matrix:
- CHILD_PROJECT: csaxs_bec - CHILD_PROJECT: csaxs_bec
CHILD_PIPELINE_BRANCH: $CSAXS_BEC_BRANCH CHILD_PIPELINE_BRANCH: $CSAXS_BEC_BRANCH
- CHILD_PROJECT: debye_bec - CHILD_PROJECT: debye_bec
CHILD_PIPELINE_BRANCH: $DEBYE_BEC_BRANCH CHILD_PIPELINE_BRANCH: $DEBYE_BEC_BRANCH
- CHILD_PROJECT: pxiii_bec - CHILD_PROJECT: pxiii_bec
CHILD_PIPELINE_BRANCH: $PXIII_BEC_BRANCH CHILD_PIPELINE_BRANCH: $PXIII_BEC_BRANCH
- CHILD_PROJECT: tomcat_bec - CHILD_PROJECT: tomcat_bec
CHILD_PIPELINE_BRANCH: $TOMCAT_BEC_BRANCH CHILD_PIPELINE_BRANCH: $TOMCAT_BEC_BRANCH
- CHILD_PROJECT: xtreme_bec - CHILD_PROJECT: xtreme_bec
CHILD_PIPELINE_BRANCH: $XTREME_BEC_BRANCH CHILD_PIPELINE_BRANCH: $XTREME_BEC_BRANCH
needs: [] needs: []
trigger: trigger:
@ -236,7 +236,7 @@ semver:
- pip install python-semantic-release==9.* wheel build twine - pip install python-semantic-release==9.* wheel build twine
- export GL_TOKEN=$CI_UPDATES - export GL_TOKEN=$CI_UPDATES
- semantic-release -vv version - semantic-release -vv version
# check if any artifacts were created # check if any artifacts were created
- if [ ! -d dist ]; then echo No release will be made; exit 0; fi - if [ ! -d dist ]; then echo No release will be made; exit 0; fi
- twine upload dist/* -u __token__ -p $CI_PYPI_TOKEN --skip-existing - twine upload dist/* -u __token__ -p $CI_PYPI_TOKEN --skip-existing