diff --git a/README.md b/README.md index e906b49..24c215f 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to GitLab is a web-based Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features, using an open-source license, developed by GitLab Inc. -**Shipped version:** 11.10.4 +**Shipped version:** 11.11.0 ## Screenshots diff --git a/manifest.json b/manifest.json index 7841684..035695a 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "Gitlab", "id": "gitlab", "packaging_format": 1, - "version": "11.10.4~ynh5", + "version": "11.11.0~ynh1", "description": { "en": "GitLab is a Git-repository manager.", "fr": "GitLab est un gestionnaire de dépôts Git." diff --git a/scripts/change_url b/scripts/change_url index ee8e540..c27647c 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -119,18 +119,12 @@ ynh_store_file_checksum --file="$config_path/gitlab.rb" gitlab-ctl reconfigure -if [ $change_path -eq 1 ]; then - ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" - gitlab-ctl restart unicorn -fi - #================================================= # WAITING GITLAB #================================================= ynh_script_progression --message="Waiting for gitlab..." --weight=15 -# Action status to just wait the service -ynh_systemd_action --action=status --service_name="gitlab-runsvdir" --log_path="/var/log/$app/unicorn/current" --line_match="adopted" --timeout=3600 +ynh_systemd_action --action=restart --service_name="gitlab-runsvdir" --log_path="/var/log/$app/unicorn/current" --line_match="adopted" --timeout=3600 #================================================= # GENERIC FINALISATION diff --git a/scripts/restore b/scripts/restore index 1a33749..d6acacf 100644 --- a/scripts/restore +++ b/scripts/restore @@ -16,6 +16,8 @@ source /usr/share/yunohost/helpers ynh_clean_setup () { ynh_exec_warn_less ynh_secure_remove --file="$tempdir" + + ynh_clean_check_starting } # Exit if an error occurs during the execution of the script ynh_abort_if_errors diff --git a/scripts/upgrade.d/upgrade.11.10.4.sh b/scripts/upgrade.d/upgrade.11.10.4.sh new file mode 100644 index 0000000..3955ac6 --- /dev/null +++ b/scripts/upgrade.d/upgrade.11.10.4.sh @@ -0,0 +1,7 @@ +gitlab_version="11.10.4" + +gitlab_x86_64_source_sha256="0c1875b86a819fc48aa0ba6df0d5e322d633056ec73dfd10a2973c48cbbd2f6a" + +gitlab_arm_source_sha256="fa551e0a01dfba22857acdc91a19e5340fc4e595085dcde07afed4bce5ea4239" + +gitlab_filename="gitlab-ce-${gitlab_version}.deb" diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 3955ac6..554bd68 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,7 +1,7 @@ -gitlab_version="11.10.4" +gitlab_version="11.11.0" -gitlab_x86_64_source_sha256="0c1875b86a819fc48aa0ba6df0d5e322d633056ec73dfd10a2973c48cbbd2f6a" +gitlab_x86_64_source_sha256="e15df41f1a9d40d23a710352ce1a77b30ebdd075dbc92430aa49dd6c3107f5c6" -gitlab_arm_source_sha256="fa551e0a01dfba22857acdc91a19e5340fc4e595085dcde07afed4bce5ea4239" +gitlab_arm_source_sha256="03ce2b720e7266fb5ea6e00b3dc4f71b0c886c336db0669422ec332fe4df4447" gitlab_filename="gitlab-ce-${gitlab_version}.deb"