From 35cf3c199a7ef1b564c8696164fbcbc59732df05 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Thu, 2 Jun 2022 13:49:58 +0200 Subject: [PATCH 1/4] 15.0.1 --- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest.json b/manifest.json index cec0fc8..5b94a75 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "GitLab", "id": "gitlab", "packaging_format": 1, - "version": "15.0.0~ynh1", + "version": "15.0.1~ynh1", "description": { "en": "Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features", "fr": "Gestionnaire de dépôts Git proposant des fonctionnalités de wiki, suivi de bugs et de pipeline CI/CD" diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 9b7b812..5d69a88 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,17 +1,17 @@ #!/bin/bash -gitlab_version="15.0.0" +gitlab_version="15.0.1" # sha256sum found here: https://packages.gitlab.com/gitlab gitlab_debian_version="$(lsb_release -sc)" -gitlab_x86_64_bullseye_source_sha256="978d97dc5fefff63a0cbf0aab81866bd8eac731b3a2f68eec768b8ca50c9250b" -gitlab_x86_64_buster_source_sha256="459573c203ebde054eefb31f0d9959585b64737d0cddeec3d7dcacd1560d7fa9" +gitlab_x86_64_bullseye_source_sha256="ee9f23d438469f932234712256ad7e858b1c688976b65ef4003beb77e7cafb34" +gitlab_x86_64_buster_source_sha256="c30134cbe7045d08b78230b81ac7671295a058462de4f42d37c801ce49454a36" -gitlab_arm64_bullseye_source_sha256="ee5a4affd8a804aefce444e6cb06eecab0f73be64ad898b4cf3c6ab091685cce" -gitlab_arm64_buster_source_sha256="c65b4b9a2e9c964cb36fb9532992c493bf16ea62e1515d5b50ac89e5f27129f9" +gitlab_arm64_bullseye_source_sha256="a152319d9bd0b932d643d9c1494ec0f69db26ead43c7d384f970d4215d21a0de" +gitlab_arm64_buster_source_sha256="94e6a4c0c571b9e54405fcc0fa67cbdbc1a4600ccf92f5fda6ad4602dd35a22d" -gitlab_arm_buster_source_sha256="4c9ed80c3c1d0aa067cec9470c09d2eb4410e605a5029a7353d74e17197a8e0d" +gitlab_arm_buster_source_sha256="7a3d0743383914ba29ade230f897e25a4fa70ce766e8eb4de7a449017e11474d" architecture=$(ynh_app_setting_get --app="$app" --key=architecture) @@ -34,8 +34,8 @@ elif [ "$architecture" = "arm64" ]; then elif [ "$architecture" = "arm" ]; then # If the version for arm doesn't exist, then use an older one if [ -z "$gitlab_arm_buster_source_sha256" ]; then - gitlab_version="15.0.0" - gitlab_arm_buster_source_sha256="4c9ed80c3c1d0aa067cec9470c09d2eb4410e605a5029a7353d74e17197a8e0d" + gitlab_version="15.0.1" + gitlab_arm_buster_source_sha256="7a3d0743383914ba29ade230f897e25a4fa70ce766e8eb4de7a449017e11474d" fi gitlab_source_sha256=$gitlab_arm_buster_source_sha256 fi From d78b9fcd6d788a6b90681dffe95579e4b6d7c21e Mon Sep 17 00:00:00 2001 From: Kay0u Date: Thu, 2 Jun 2022 13:50:42 +0200 Subject: [PATCH 2/4] there is only a buster version for arm --- conf/arm.src.default | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/arm.src.default b/conf/arm.src.default index 09a5abd..395db91 100644 --- a/conf/arm.src.default +++ b/conf/arm.src.default @@ -1,4 +1,4 @@ -SOURCE_URL=https://packages.gitlab.com/gitlab/raspberry-pi2/packages/raspbian/__GITLAB_DEBIAN_VERSION__/gitlab-ce___GITLAB_VERSION__-ce.0_armhf.deb/download.deb +SOURCE_URL=https://packages.gitlab.com/gitlab/raspberry-pi2/packages/raspbian/buster/gitlab-ce___GITLAB_VERSION__-ce.0_armhf.deb/download.deb SOURCE_SUM=__GITLAB_SOURCE_SHA256__ SOURCE_SUM_PRG=sha256sum SOURCE_FILENAME=__GITLAB_FILENAME__ From 3bcff353230634355a4fcb6db4ef37e367892f67 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 2 Jun 2022 11:50:49 +0000 Subject: [PATCH 3/4] Auto-update README --- README.md | 21 +++++++++++---------- README_fr.md | 27 ++++++++++++++++----------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index b90659b..4b3817b 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # GitLab for YunoHost -[![Integration level](https://dash.yunohost.org/integration/gitlab.svg)](https://dash.yunohost.org/appci/app/gitlab) ![](https://ci-apps.yunohost.org/ci/badges/gitlab.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/gitlab.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/gitlab.svg)](https://dash.yunohost.org/appci/app/gitlab) ![Working status](https://ci-apps.yunohost.org/ci/badges/gitlab.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/gitlab.maintain.svg) [![Install GitLab with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=gitlab) *[Lire ce readme en français.](./README_fr.md)* @@ -17,13 +17,13 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features -**Shipped version:** 15.0.0~ynh1 +**Shipped version:** 15.0.1~ynh1 **Demo:** https://gitlab.com/explore ## Screenshots -![](./doc/screenshots/GitLab_running_11.0_(2018-07).png) +![Screenshot of GitLab](./doc/screenshots/GitLab_running_11.0_(2018-07).png) ## Disclaimers / important information @@ -45,21 +45,22 @@ How to configure GitLab: ## Documentation and resources -* Official app website: https://gitlab.com -* Official admin documentation: https://docs.gitlab.com/ -* Upstream app code repository: https://gitlab.com/gitlab-org/omnibus-gitlab - https://gitlab.com/gitlab-org/gitlab -* YunoHost documentation for this app: https://yunohost.org/app_gitlab -* Report a bug: https://github.com/YunoHost-Apps/gitlab_ynh/issues +* Official app website: +* Official admin documentation: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/gitlab_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/gitlab_ynh/tree/testing --debug or sudo yunohost app upgrade gitlab -u https://github.com/YunoHost-Apps/gitlab_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index e95bc4e..f0661b7 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # GitLab pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/gitlab.svg)](https://dash.yunohost.org/appci/app/gitlab) ![](https://ci-apps.yunohost.org/ci/badges/gitlab.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/gitlab.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/gitlab.svg)](https://dash.yunohost.org/appci/app/gitlab) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/gitlab.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/gitlab.maintain.svg) [![Installer GitLab avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=gitlab) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer GitLab rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* @@ -13,13 +17,13 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Gestionnaire de dépôts Git proposant des fonctionnalités de wiki, suivi de bugs et de pipeline CI/CD -**Version incluse :** 15.0.0~ynh1 +**Version incluse :** 15.0.1~ynh1 **Démo :** https://gitlab.com/explore ## Captures d'écran -![](./doc/screenshots/GitLab_running_11.0_(2018-07).png) +![Capture d'écran de GitLab](./doc/screenshots/GitLab_running_11.0_(2018-07).png) ## Avertissements / informations importantes @@ -41,21 +45,22 @@ Comment configurer GitLab : ## Documentations et ressources -* Site officiel de l'app : https://gitlab.com -* Documentation officielle de l'admin : https://docs.gitlab.com/ -* Dépôt de code officiel de l'app : https://gitlab.com/gitlab-org/omnibus-gitlab - https://gitlab.com/gitlab-org/gitlab -* Documentation YunoHost pour cette app : https://yunohost.org/app_gitlab -* Signaler un bug : https://github.com/YunoHost-Apps/gitlab_ynh/issues +* Site officiel de l'app : +* Documentation officielle de l'admin : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/gitlab_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/gitlab_ynh/tree/testing --debug ou sudo yunohost app upgrade gitlab -u https://github.com/YunoHost-Apps/gitlab_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** From 1e963f64857babf6ebac988d044b9381963ddbbf Mon Sep 17 00:00:00 2001 From: Kay0u Date: Thu, 2 Jun 2022 13:55:12 +0200 Subject: [PATCH 4/4] 14.10.4 --- scripts/upgrade.d/upgrade.14.last.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/upgrade.d/upgrade.14.last.sh b/scripts/upgrade.d/upgrade.14.last.sh index 60daf7d..7e5dc77 100644 --- a/scripts/upgrade.d/upgrade.14.last.sh +++ b/scripts/upgrade.d/upgrade.14.last.sh @@ -1,17 +1,17 @@ #!/bin/bash -gitlab_version="14.10.3" +gitlab_version="14.10.4" # sha256sum found here: https://packages.gitlab.com/gitlab gitlab_debian_version="$(lsb_release -sc)" -gitlab_x86_64_bullseye_source_sha256="6e9365b30d0d4efeebb84be43acb899fbd2e1fb077c86d66f18845b10789b63a" -gitlab_x86_64_buster_source_sha256="897c76a8df2a744ac9788e703a054e857366ec36f6aa7208ee130f89413eeb52" +gitlab_x86_64_bullseye_source_sha256="a026d0bace56bf2cbe6ae6f60d998dba183e9d6606f158df8ebf2da727fa53ee" +gitlab_x86_64_buster_source_sha256="c4c06776ad990c2112ef095454c8a5edfc89e29ca0eef1f7f9f4cfa375fcb266" -gitlab_arm64_bullseye_source_sha256="6b8fd05d4a9477272343f7e821fb713d4c85d015358352a0f45702dbf48d672a" -gitlab_arm64_buster_source_sha256="23e6393ed07254c3d34b09cdd8aa34af107ee7934471fe439315ef0249b45db8" +gitlab_arm64_bullseye_source_sha256="7eb714f383d7dd933590cf45829e135500643ed93dbea720ae4f3a49197c9cdf" +gitlab_arm64_buster_source_sha256="586cc2af4cfc49f94003234d061ac7c4472f547ef3ab9ad9073cfbe519acc97e" -gitlab_arm_buster_source_sha256="223d3081f660739363d4c240e229288f95392593b68c54afe5b18ca8fc6908c3" +gitlab_arm_buster_source_sha256="f3f6b21bdcda6035c8ec3b8baf64dc07a48f96ea42c0f411b077a657baf1bba9" architecture=$(ynh_app_setting_get --app="$app" --key=architecture) @@ -34,8 +34,8 @@ elif [ "$architecture" = "arm64" ]; then elif [ "$architecture" = "arm" ]; then # If the version for arm doesn't exist, then use an older one if [ -z "$gitlab_arm_buster_source_sha256" ]; then - gitlab_version="14.10.3" - gitlab_arm_buster_source_sha256="223d3081f660739363d4c240e229288f95392593b68c54afe5b18ca8fc6908c3" + gitlab_version="14.10.4" + gitlab_arm_buster_source_sha256="f3f6b21bdcda6035c8ec3b8baf64dc07a48f96ea42c0f411b077a657baf1bba9" fi gitlab_source_sha256=$gitlab_arm_buster_source_sha256 fi