YunoHost-Apps/gitlab_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/gitlab_ynh.git synced 2024-09-03 18:36:35 +02:00
Code Issues Activity Actions

Merge pull request #112 from YunoHost-Apps/testing

Browse source 
Fix upgrade
This commit is contained in:
Kayou 2020-05-16 11:44:17 +02:00 committed by GitHub
commit 6dc05d4c3c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
check_process
View file

@ -16,6 +16,7 @@
setup_public=1 setup_public=1
upgrade=1 upgrade=1
upgrade=1 from_commit=2cc84310aeff7055342b445c1aee01d4183d5ae2 upgrade=1 from_commit=2cc84310aeff7055342b445c1aee01d4183d5ae2
upgrade=1 from_commit=7c352aff3fb13fc425d76716477c28db5d54ac99
backup_restore=1 backup_restore=1
multi_instance=0 multi_instance=0
port_already_use=1 (8080) port_already_use=1 (8080)
@ -25,3 +26,8 @@
;;; Options ;;; Options
Email= Email=
Notification=none Notification=none
;;; Upgrade options
; commit=2cc84310aeff7055342b445c1aee01d4183d5ae2
name=11.6.3
; commit=7c352aff3fb13fc425d76716477c28db5d54ac99
name=12.9.2

2
manifest.json
View file

@ -2,7 +2,7 @@
"name": "Gitlab", "name": "Gitlab",
"id": "gitlab", "id": "gitlab",
"packaging_format": 1, "packaging_format": 1,
"version": "12.10.3~ynh1", "version": "12.10.3~ynh2",
"description": { "description": {
"en": "Git-repository manager.", "en": "Git-repository manager.",
"fr": "Gestionnaire de dépôts Git." "fr": "Gestionnaire de dépôts Git."

8
scripts/upgrade
View file

@ -241,7 +241,6 @@ then
# Load the last available version # Load the last available version
source ./upgrade.d/upgrade.last.sh source ./upgrade.d/upgrade.last.sh
last_version=$gitlab_version last_version=$gitlab_version
last_major_version=${gitlab_version%%.*}
# While the current version is not the last version, do an upgrade # While the current version is not the last version, do an upgrade
while [ "$last_version" != "$current_version" ] while [ "$last_version" != "$current_version" ]
@ -249,8 +248,11 @@ then
current_major_version=${current_version%%.*} 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 source ./upgrade.d/upgrade.$current_major_version.sh
if [ "$gitlab_version" = "$current_version" ]; then
# 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)) current_major_version=$(($current_major_version + 1))
fi fi