From 59a45cfda28767a86406fabde2b03aee33150d3f Mon Sep 17 00:00:00 2001 From: Dejan <dejan@acolono.com> Date: Tue, 14 Mar 2023 18:15:53 +0000 Subject: [PATCH] #51 make sure SANITIZED_BRANCH_NAME is always lowercase --- data-handling-ng.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data-handling-ng.yml b/data-handling-ng.yml index 9ee696f..5168f52 100644 --- a/data-handling-ng.yml +++ b/data-handling-ng.yml @@ -61,7 +61,7 @@ CollectConfig: - branch=${CHAT_INPUT}${TRIGGER_INPUT} - if [[ ! -d /data/${branch} ]]; then echo "Branch $branch does not exist"; exit 1; fi - cd /data/${branch}/app - - SANITIZED_BRANCH_NAME=$(echo ${branch} | sed -r 's/[/_]+/-/g') + - SANITIZED_BRANCH_NAME=$(echo ${branch} | tr [:upper:] [:lower:] | sed -r 's/[/_]+/-/g') - docker compose --project-name ${PROJECT_NAME}_${SANITIZED_BRANCH_NAME} exec php drush sql:dump --result-file=/var/backups/mysql/drupal.sql - cd - - cp /data/${branch}/files/db/drupal.sql . @@ -166,7 +166,7 @@ ResetLocales: - echo "Branch ${branch}" - if [[ ! -d /data/${branch}/app ]]; then branch=${CI_COMMIT_REF_NAME}; fi - cd /data/${branch}/app - - SANITIZED_BRANCH_NAME=$(echo ${branch} | sed -r 's/[/_]+/-/g') + - SANITIZED_BRANCH_NAME=$(echo ${branch} | tr [:upper:] [:lower:] | sed -r 's/[/_]+/-/g') - docker compose --project-name ${PROJECT_NAME}_${SANITIZED_BRANCH_NAME} exec php drush -y sql:query "truncate locales_location;" - docker compose --project-name ${PROJECT_NAME}_${SANITIZED_BRANCH_NAME} exec php drush -y sql:query "truncate locales_source;" - docker compose --project-name ${PROJECT_NAME}_${SANITIZED_BRANCH_NAME} exec php drush -y sql:query "truncate locales_target;" @@ -198,7 +198,7 @@ ResetLocalesCustom: - IFS=' ' read branch <<< ${CHAT_INPUT} - if [[ ! -d /data/${branch}/app ]]; then branch=${CI_COMMIT_REF_NAME}; fi - cd /data/${branch}/app - - SANITIZED_BRANCH_NAME=$(echo ${branch} | sed -r 's/[/_]+/-/g') + - SANITIZED_BRANCH_NAME=$(echo ${branch} | tr [:upper:] [:lower:] | sed -r 's/[/_]+/-/g') - docker compose --project-name ${PROJECT_NAME}_${SANITIZED_BRANCH_NAME} exec php drush -y locale:import ${LANG} ${FILE} --type=custom --override=all DeployAssetsToDrupal: @@ -223,7 +223,7 @@ DeployAssetsToDrupal: - cd /data/${CI_COMMIT_REF_NAME}/app - rm -rf vendor/${ASSET_PATH} - git clone -b ${ASSET_BRANCH} ${ASSET_REPO} vendor/${ASSET_PATH} - - SANITIZED_BRANCH_NAME=$(echo ${CI_COMMIT_REF_NAME} | sed -r 's/[/_]+/-/g') + - SANITIZED_BRANCH_NAME=$(echo ${CI_COMMIT_REF_NAME} | tr [:upper:] [:lower:] | sed -r 's/[/_]+/-/g') - docker compose --project-name ${PROJECT_NAME}_${SANITIZED_BRANCH_NAME} exec php drush migrate:import --all --skip-progress-bar - docker compose --project-name ${PROJECT_NAME}_${SANITIZED_BRANCH_NAME} exec php drush migrate:import --all --skip-progress-bar -- GitLab