diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7bddd0e..492e0a4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,7 +86,15 @@ deploy:staging: MAIN=$(grep '\$mainversion' "${VERSION_WORK_FILE}" 2>/dev/null | tr -cd '0-9') SUB=$(grep '\$subversion' "${VERSION_WORK_FILE}" 2>/dev/null | tr -cd '0-9') - PATCH=$(grep '\$patchversion' "${VERSION_WORK_FILE}" 2>/dev/null | tr -cd '0-9') + + PATCH_FILE="${CONFIG_ENV_DIR}/versionsnummer.txt" + if [ ! -f "${PATCH_FILE}" ]; then + echo "0" > "${PATCH_FILE}" + fi + PATCH=$(tr -cd '0-9' < "${PATCH_FILE}") + if [ -z "$PATCH" ]; then + PATCH=$(grep '\$patchversion' "${VERSION_WORK_FILE}" 2>/dev/null | tr -cd '0-9') + fi [ -z "$MAIN" ] && MAIN=1 [ -z "$SUB" ] && SUB=0 @@ -132,12 +140,21 @@ deploy:staging: echo "🆙 Neue ${CI_ENVIRONMENT_NAME} Version (${BUMP_NOTE}): ${MAIN}.${SUB}.${PATCH}" + echo "${PATCH}" > "${PATCH_FILE}" + # Neue versions.php bauen { echo ' "${VERSION_WORK_FILE}" # Textdatei für die Webseite @@ -276,7 +293,15 @@ deploy:production: MAIN=$(grep '\$mainversion' "${VERSION_WORK_FILE}" 2>/dev/null | tr -cd '0-9') SUB=$(grep '\$subversion' "${VERSION_WORK_FILE}" 2>/dev/null | tr -cd '0-9') - PATCH=$(grep '\$patchversion' "${VERSION_WORK_FILE}" 2>/dev/null | tr -cd '0-9') + + PATCH_FILE="${CONFIG_ENV_DIR}/versionsnummer.txt" + if [ ! -f "${PATCH_FILE}" ]; then + echo "0" > "${PATCH_FILE}" + fi + PATCH=$(tr -cd '0-9' < "${PATCH_FILE}") + if [ -z "$PATCH" ]; then + PATCH=$(grep '\$patchversion' "${VERSION_WORK_FILE}" 2>/dev/null | tr -cd '0-9') + fi [ -z "$MAIN" ] && MAIN=1 [ -z "$SUB" ] && SUB=0 @@ -322,12 +347,21 @@ deploy:production: echo "🆙 Neue ${CI_ENVIRONMENT_NAME} Version (${BUMP_NOTE}): ${MAIN}.${SUB}.${PATCH}" + echo "${PATCH}" > "${PATCH_FILE}" + # Neue versions.php bauen { echo ' "${VERSION_WORK_FILE}" # Textdatei für die Webseite diff --git a/config/prod/versions.php b/config/prod/versions.php index 56e410d..279742f 100644 --- a/config/prod/versions.php +++ b/config/prod/versions.php @@ -1,4 +1,12 @@