Merge pull request #20 from YunoHost-Apps/testing

Upgrade to 11.7.0 and refactor

README.md

@@ -1,6 +1,6 @@
 # Gitlab for Yunohost
 
-[![Integration level](https://dash.yunohost.org/integration/gitlab.svg)](https://ci-apps.yunohost.org/jenkins/job/gitlab%20%28Community%29/lastBuild/consoleFull)  
+[![Integration level](https://dash.yunohost.org/integration/gitlab.svg)](https://dash.yunohost.org/appci/app/gitlab)  
 [![Install gitlab with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=gitlab)
 
 > *This package allow you to install gitlab quickly and simply on a YunoHost server.  
@@ -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:** 1.6.3
+**Shipped version:** 1.7.0
 
 ## Screenshots
 

check_process

@@ -14,7 +14,7 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		upgrade=1		from_commit=e4f6f32b47718284283fbd6f7f928f921e81d871
+		upgrade=1		from_commit=2cc84310aeff7055342b445c1aee01d4183d5ae2
 		backup_restore=1
 		multi_instance=0
 		incorrect_path=1

manifest.json

@@ -2,7 +2,7 @@
     "name": "Gitlab",
     "id": "gitlab",
     "packaging_format": 1,
-    "version": "1.6.3~ynh1",
+    "version": "1.7.0~ynh1",
     "description": {
         "en": "Gitlab for Yunohost.",
         "fr": "Gitlab pour YunoHost."

scripts/_common.sh

@@ -61,7 +61,7 @@ remove_config_gitlab() {
 # UPDATE SOURCES FILES
 #=================================================
 update_src_version() {
-	source ./upgrade.d/upgrade.sh
+	source ./upgrade.d/upgrade.last.sh
 	cp ../conf/arm.src.default ../conf/arm.src
 	ynh_replace_string "__VERSION__" "$gitlab_version" "../conf/arm.src"
 	ynh_replace_string "__SHA256_SUM__" "$gitlab_arm_source_sha256" "../conf/arm.src"

scripts/install

@@ -60,7 +60,7 @@ ynh_app_setting_set $app use_web_account $use_web_account
 
 # Find free ports
 port=$(ynh_find_port 8080)
-portUnicorn=$(ynh_find_port 9080)
+portUnicorn=$(ynh_find_port $(($port + 1)))
 
 yunohost firewall allow --no-upnp TCP $port 2>&1
 yunohost firewall allow --no-upnp TCP $portUnicorn 2>&1

scripts/restore

@@ -6,19 +6,22 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
+# Source YunoHost helpers
+source /usr/share/yunohost/helpers
+
+# Exit if an error occurs during the execution of the script
+ynh_abort_if_errors
+
 if [ ! -e _common.sh ]; then
 	# Get the _common.sh file if it's not in the current directory
 	cp ../settings/scripts/_common.sh ./_common.sh
 	mkdir ./upgrade.d
 	mkdir ../conf
-	cp ../settings/scripts/upgrade.d/upgrade.sh ./upgrade.d/upgrade.sh
+	cp ../settings/scripts/upgrade.d/*.sh ./upgrade.d/*.sh
 	cp ../settings/conf/*.default ../conf/
-	chmod a+rx _common.sh upgrade.d/upgrade.sh
+	chmod a+rx _common.sh upgrade.d/*.sh
 fi
 
-# Source YunoHost helpers
-source /usr/share/yunohost/helpers
-
 # Load common variables and helpers
 source _common.sh
 
@@ -32,9 +35,6 @@ ynh_clean_setup () {
 	true
 }
 
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
 #=================================================
 # LOAD SETTINGS
 #=================================================

scripts/upgrade.d/upgrade.last.sh

@@ -0,0 +1,5 @@
+gitlab_version="11.7.0"
+
+gitlab_x86_64_source_sha256="5a989b1e664494e6de139064b349fe9b22f37d5edd2918a4968fdf5e818a10c4"
+
+gitlab_arm_source_sha256="558e6b3cf87bd5c8b3dee567b2557ee6cc3fb40655cc6dabe5531c94cf27b99d"