diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 894923630b7e8a14f2e1446d4c3f9431dfc3abbd..2b9b3dab8204da9c79757458592596d1129eae01 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,12 +41,10 @@ unit_test2: 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} - | - # Navigate to the project directory - cd ${CI_PROJECT_NAME} - - # Find the second last commit hash where ${APP_PAGE} was changed - LAST_COMMIT_HASH=$(git log -3 --pretty=format:"%H" -- ${APP_PAGE} | tail -n 1) + # 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) @@ -56,7 +54,6 @@ unit_test2: 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 "Version string in ${APP_PAGE}: ${VERSION_STRING}" echo "Previous version string: ${PREVIOUS_VERSION_STRING}" echo "Current version string: ${CURRENT_VERSION_STRING}" @@ -66,8 +63,6 @@ unit_test2: exit 1 fi - - deploy_prod: stage: deploy environment: