From 1148cf0f5d6c077055515605022dd48c0b589ede Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joan=20Vallv=C3=A9=20Navarro?= <jvallve@iri.upc.edu> Date: Fri, 3 Mar 2023 11:05:55 +0100 Subject: [PATCH] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 42 +++--------------------------------------- 1 file changed, 3 insertions(+), 39 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4918b03ba..6f6c7ad50 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,6 +4,7 @@ include: workflow: rules: - if: '$CI_PIPELINE_SOURCE == "web"' + when: always #- if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push" # when: never - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' @@ -74,42 +75,6 @@ stages: # create 'ci_deps' folder (if not exists) - mkdir -pv ci_deps -# .license_header_template: &license_header_definition -# - cd $CI_PROJECT_DIR - -# # configure git -# - export CI_NEW_BRANCH=ci_processing$RANDOM -# - echo creating new temporary branch... $CI_NEW_BRANCH -# - git config --global user.email "${CI_EMAIL}" -# - git config --global user.name "${CI_USERNAME}" -# - git checkout -b $CI_NEW_BRANCH # temporary branch - -# # license headers -# - export CURRENT_YEAR=$( date +'%Y' ) -# - echo "current year:" ${CURRENT_YEAR} -# - cd wolf_scripts -# - if [ -f license_header_${CURRENT_YEAR}.txt ]; then -# # add license headers to new files -# - echo "File license_header_${CURRENT_YEAR}.txt already exists. License headers are assumed to be updated. Adding headers to new files..." -# - ./license_manager.sh --add --path=${CI_PROJECT_DIR} --license-header=license_header_${CURRENT_YEAR}.txt -# - else -# # update license headers of all files -# - export PREV_YEAR=$(( CURRENT_YEAR-1 )) -# - echo "Creating new file license_header_${CURRENT_YEAR}.txt..." -# - git mv license_header_${PREV_YEAR}.txt license_header_${CURRENT_YEAR}.txt -# - sed -i "s/${PREV_YEAR}/${PREV_YEAR},${CURRENT_YEAR}/g" license_header_${CURRENT_YEAR}.txt -# - ./license_manager.sh --update --path=${CI_PROJECT_DIR} --license-header=license_header_${CURRENT_YEAR}.txt -# - fi -# - cd .. - -# # push changes (if any) -# - if git commit -a -m "[skip ci] license headers added or modified" ; then -# - git remote set-url --push origin "ssh://git@gitlab.iri.upc.edu:2202/${CI_PROJECT_PATH}.git" -# - git push origin $CI_NEW_BRANCH:${CI_COMMIT_REF_NAME} -# - else -# - echo "No changes, nothing to commit!" -# - fi - .install_yamlschemacpp_template: &install_yamlschemacpp_definition - cd ${CI_PROJECT_DIR}/ci_deps - if [ -d yaml-schema-cpp ]; then @@ -148,7 +113,6 @@ license_header: - *preliminaries_definition script: - !reference [.license_header_script] - # - *license_header_definition ############ UBUNTU 18.04 TESTS ############ build_and_test:bionic: @@ -157,7 +121,7 @@ build_and_test:bionic: cache: - key: yamlschemacpp-bionic paths: - - ci_deps/yaml_schema_cpp/ + - ci_deps/yaml-schema-cpp/ script: - *preliminaries_definition - *install_yamlschemacpp_definition @@ -170,7 +134,7 @@ build_and_test:focal: cache: - key: yamlschemacpp-focal paths: - - ci_deps/yaml_schema_cpp/ + - ci_deps/yaml-schema-cpp/ script: - *preliminaries_definition - *install_yamlschemacpp_definition -- GitLab