diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2b9b3dab8204da9c79757458592596d1129eae01..ed650ea104d399c9f1f17b14c3cc8cb9c82e9a26 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,33 +36,6 @@ unit_test1: - '[[ $(sed -nr "/^\s*Version:\s+([[:digit:]]\.){2}[[:digit:]]\s*\$/p" ${CI_PROJECT_NAME}/${APP_PAGE} | wc -l) -eq 1 ]] || { echo "[error] Version string badly formatted or not found"; exit 1; }' -unit_test2: - stage: test - script: - - echo "This job shall test that the version string in '${APP_PAGE}' is only incremented" - - git clone --depth=1 ${CLONE_URL_TOK}/${CI_PROJECT_PATH} - - cd ${CI_PROJECT_NAME} - - | - # Find the commit hash before the current commit where ${APP_PAGE} was changed - LAST_COMMIT_HASH=$(git rev-list HEAD -- ${APP_PAGE} | sed -n '2p') - - # Extract the version string from that commit for ${APP_PAGE} - PREVIOUS_VERSION_STRING=$(git show ${LAST_COMMIT_HASH}:${APP_PAGE} | sed -nr "/^\s*Version:\s+([[:digit:]]\.){2}[[:digit:]]\s*\$/p" | cut -d" " -f2) - PREVIOUS_PATCH_NUMBER=$(echo $PREVIOUS_VERSION_STRING | cut -d"." -f3) - - # Extract the current version string from ${APP_PAGE} - CURRENT_VERSION_STRING=$(sed -nr "/^\s*Version:\s+([[:digit:]]\.){2}[[:digit:]]\s*\$/p" ${APP_PAGE} | cut -d" " -f2) - CURRENT_PATCH_NUMBER=$(echo $CURRENT_VERSION_STRING | cut -d"." -f3) - - echo "Previous version string: ${PREVIOUS_VERSION_STRING}" - echo "Current version string: ${CURRENT_VERSION_STRING}" - - # Check if the current patch number is one more than the previous patch number - if [[ $((CURRENT_PATCH_NUMBER)) -ne $((PREVIOUS_PATCH_NUMBER + 1)) ]]; then - echo "[error] Version string not incremented correctly" - exit 1 - fi - deploy_prod: stage: deploy environment: