From 9c300f033c5a14e95d9194fb954e021c875b1da3 Mon Sep 17 00:00:00 2001 From: Bourre Pierre Date: Tue, 22 Jan 2019 15:45:23 +0100 Subject: [PATCH 1/4] Change integration url for the yunohost dashboard --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d0baac7..3abbe8c 100644 --- a/README.md +++ b/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. From cd1b3fd75388c1913ccc7ab93885a114d3e452b4 Mon Sep 17 00:00:00 2001 From: Bourre Pierre Date: Tue, 22 Jan 2019 15:47:54 +0100 Subject: [PATCH 2/4] change the way we look for the unicorn port --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 71d0a6e..38d126d 100644 --- a/scripts/install +++ b/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 From 41fb54152badbf572a3c12eb807d71bba20a453a Mon Sep 17 00:00:00 2001 From: Bourre Pierre Date: Tue, 22 Jan 2019 15:53:43 +0100 Subject: [PATCH 3/4] upgrade to 11.7.0 --- README.md | 2 +- check_process | 2 +- manifest.json | 2 +- scripts/upgrade.d/upgrade.sh | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 3abbe8c..7f075c8 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:** 1.6.3 +**Shipped version:** 1.7.0 ## Screenshots diff --git a/check_process b/check_process index dd8ec09..72b92de 100644 --- a/check_process +++ b/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 diff --git a/manifest.json b/manifest.json index b15b8e2..e4c7e26 100644 --- a/manifest.json +++ b/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." diff --git a/scripts/upgrade.d/upgrade.sh b/scripts/upgrade.d/upgrade.sh index d809e94..6c4706e 100644 --- a/scripts/upgrade.d/upgrade.sh +++ b/scripts/upgrade.d/upgrade.sh @@ -1,5 +1,5 @@ -gitlab_version="11.6.3" +gitlab_version="11.7.0" -gitlab_x86_64_source_sha256="5a990a76c1656ddd42673562d8bd1be106a835331a2ce976d405c536a5567485" +gitlab_x86_64_source_sha256="5a989b1e664494e6de139064b349fe9b22f37d5edd2918a4968fdf5e818a10c4" -gitlab_arm_source_sha256="3b1d1c650df8722d0b63b5db3e6c2440ea70224deeca0621a9c5226a06079d2e" +gitlab_arm_source_sha256="558e6b3cf87bd5c8b3dee567b2557ee6cc3fb40655cc6dabe5531c94cf27b99d" From ecfdd4a5e61547a1f7ff08c4a3b2d13a89018bfb Mon Sep 17 00:00:00 2001 From: Bourre Pierre Date: Tue, 22 Jan 2019 16:05:08 +0100 Subject: [PATCH 4/4] track all upgrades in separate file --- scripts/_common.sh | 2 +- scripts/restore | 16 ++++++++-------- scripts/upgrade.d/upgrade.11.6.3.sh | 5 +++++ .../upgrade.d/{upgrade.sh => upgrade.last.sh} | 0 4 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 scripts/upgrade.d/upgrade.11.6.3.sh rename scripts/upgrade.d/{upgrade.sh => upgrade.last.sh} (100%) diff --git a/scripts/_common.sh b/scripts/_common.sh index 4e6c56e..48f7287 100644 --- a/scripts/_common.sh +++ b/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" diff --git a/scripts/restore b/scripts/restore index 1bb89e6..b35babd 100644 --- a/scripts/restore +++ b/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 #================================================= diff --git a/scripts/upgrade.d/upgrade.11.6.3.sh b/scripts/upgrade.d/upgrade.11.6.3.sh new file mode 100644 index 0000000..d809e94 --- /dev/null +++ b/scripts/upgrade.d/upgrade.11.6.3.sh @@ -0,0 +1,5 @@ +gitlab_version="11.6.3" + +gitlab_x86_64_source_sha256="5a990a76c1656ddd42673562d8bd1be106a835331a2ce976d405c536a5567485" + +gitlab_arm_source_sha256="3b1d1c650df8722d0b63b5db3e6c2440ea70224deeca0621a9c5226a06079d2e" diff --git a/scripts/upgrade.d/upgrade.sh b/scripts/upgrade.d/upgrade.last.sh similarity index 100% rename from scripts/upgrade.d/upgrade.sh rename to scripts/upgrade.d/upgrade.last.sh