From 195a382af49d49ef0fd388d599e280e350f901ad Mon Sep 17 00:00:00 2001 From: appel_c Date: Mon, 29 Apr 2024 08:44:22 +0200 Subject: [PATCH] ci: update gitlab ci file with package dependency job --- .gitlab-ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 673a6a7..15f4783 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,8 @@ workflow: include: - template: Security/Secret-Detection.gitlab-ci.yml - + - project: "bec/awi_utils" + file: "awi_utils/test_pkg_versions/.gitlab-ci-job-check-pkg.yml" #commands to run in the Docker container before starting each job. before_script: @@ -53,10 +54,10 @@ pylint-check: script: # Identify changed Python files - if [ "$CI_PIPELINE_SOURCE" == "merge_request_event" ]; then - TARGET_BRANCH_COMMIT_SHA=$(git rev-parse $CI_MERGE_REQUEST_TARGET_BRANCH_NAME); - CHANGED_FILES=$(git diff --name-only $SOURCE_BRANCH_COMMIT_SHA $TARGET_BRANCH_COMMIT_SHA | grep '\.py$' || true); + TARGET_BRANCH_COMMIT_SHA=$(git rev-parse $CI_MERGE_REQUEST_TARGET_BRANCH_NAME); + CHANGED_FILES=$(git diff --name-only $SOURCE_BRANCH_COMMIT_SHA $TARGET_BRANCH_COMMIT_SHA | grep '\.py$' || true); else - CHANGED_FILES=$(git diff --name-only $CI_COMMIT_BEFORE_SHA $CI_COMMIT_SHA | grep '\.py$' || true); + CHANGED_FILES=$(git diff --name-only $CI_COMMIT_BEFORE_SHA $CI_COMMIT_SHA | grep '\.py$' || true); fi - if [ -z "$CHANGED_FILES" ]; then echo "No Python files changed."; exit 0; fi @@ -75,10 +76,10 @@ pylint-check: secret_detection: before_script: - - '' + - "" config_test: - stage: test + stage: test script: - ophyd_test --config ./csaxs_bec/device_configs/ --output ./config_tests artifacts: @@ -88,7 +89,6 @@ config_test: expire_in: "30 days" allow_failure: true - pytest: stage: test script: