diff --git a/check_process b/check_process index 45a2323..a4705b6 100644 --- a/check_process +++ b/check_process @@ -16,6 +16,7 @@ setup_public=1 upgrade=1 upgrade=1 from_commit=2cc84310aeff7055342b445c1aee01d4183d5ae2 + upgrade=1 from_commit=7c352aff3fb13fc425d76716477c28db5d54ac99 backup_restore=1 multi_instance=0 port_already_use=1 (8080) @@ -25,3 +26,8 @@ ;;; Options Email= Notification=none +;;; Upgrade options + ; commit=2cc84310aeff7055342b445c1aee01d4183d5ae2 + name=11.6.3 + ; commit=7c352aff3fb13fc425d76716477c28db5d54ac99 + name=12.9.2 diff --git a/manifest.json b/manifest.json index da6d722..ba01a3b 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "12.10.3~ynh1", + "version": "12.10.3~ynh2", "description": { "en": "Git-repository manager.", "fr": "Gestionnaire de dépôts Git." diff --git a/scripts/upgrade b/scripts/upgrade index 8d8bc37..226be90 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -241,7 +241,6 @@ then # Load the last available version source ./upgrade.d/upgrade.last.sh last_version=$gitlab_version - last_major_version=${gitlab_version%%.*} # While the current version is not the last version, do an upgrade while [ "$last_version" != "$current_version" ] @@ -249,8 +248,11 @@ then current_major_version=${current_version%%.*} - # If the current version is equal to the last minor version of upgrade.$current_major_version.sh, increment the major version - if [ "$gitlab_version" = "$current_version" ]; then + source ./upgrade.d/upgrade.$current_major_version.sh + + # if the version stored in the upgrade.$current_major_version.sh file is less than or equal + # to the current version, increment the major version to upgrade to the next version + if dpkg --compare-versions "$gitlab_version" "le" "$current_version"; then current_major_version=$(($current_major_version + 1)) fi