From 883dc8ee58454e808ba25a7f52ad55486f88d949 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 22 Mar 2024 02:37:39 +0100 Subject: [PATCH 1/4] Upgrade to v16.10.0 https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.10.0 --- manifest.toml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest.toml b/manifest.toml index c008edb..0173110 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "GitLab Runner" description.en = "Continuous integration tool to use with a GitLab instance (YNH or not)" description.fr = "Outil d'intégration continue à utiliser avec une instance GitLab (YNH ou non)" -version = "16.9.0~ynh1" +version = "16.10.0~ynh1" maintainers = ["kay0u"] @@ -57,14 +57,14 @@ ram.runtime = "50M" [resources] [resources.sources.main] rename = "gitlab-runner.deb" - amd64.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.9.0/downloads/packages/deb/gitlab-runner_amd64.deb" - amd64.sha256 = "58e6d83b5de3325014b3526b3f9ea2ddc9e716fefe5678ae37519d9b534a1e92" - i386.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.9.0/downloads/packages/deb/gitlab-runner_i386.deb" - i386.sha256 = "76cb0d6ae41cab42107a62b7289469143eb3f441d15f847f864094e755970f95" - arm64.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.9.0/downloads/packages/deb/gitlab-runner_arm64.deb" - arm64.sha256 = "03891b0a004cdda3cf6aa5193e03b3992f90dc8d6aa96f88058643661887defc" - armhf.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.9.0/downloads/packages/deb/gitlab-runner_armhf.deb" - armhf.sha256 = "3239e08c7a9a4a0efea472892654b3cd5d6e6e34a75279e06c83e436f6440aaa" + amd64.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.10.0/downloads/packages/deb/gitlab-runner_amd64.deb" + amd64.sha256 = "f438740431e969c5d4bfaaeaa1451a9ced501e0ba715d9b01e882210f5bdfbbd" + i386.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.10.0/downloads/packages/deb/gitlab-runner_i386.deb" + i386.sha256 = "49e088968423e2ad13683c7a1659ccaa949f14dbf5efd214b37abdff7bc94706" + arm64.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.10.0/downloads/packages/deb/gitlab-runner_arm64.deb" + arm64.sha256 = "35b43b2c0fd2131cb24e39f0940b611eb74316d2151015a37d81171b9bb7c836" + armhf.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.10.0/downloads/packages/deb/gitlab-runner_armhf.deb" + armhf.sha256 = "b885babed240e1a89c3bf7d0ed08206646b853165c579534cf7173e8c5702a00" autoupdate.upstream = "https://gitlab.com/gitlab-org/gitlab-runner" autoupdate.strategy = "latest_gitlab_release" From 094fc2fafc7484c3894ef2066a25dffdd4d122b9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 22 Mar 2024 01:37:43 +0000 Subject: [PATCH 2/4] Auto-update README --- README.md | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 8f35aaf..df9b6a5 100644 --- a/README.md +++ b/README.md @@ -18,8 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in GitLab Runner is a continuous integration tool to use with a GitLab instance (YNH or not). - -**Shipped version:** 16.9.0~ynh1 +**Shipped version:** 16.10.0~ynh1 ## Screenshots @@ -27,11 +26,11 @@ GitLab Runner is a continuous integration tool to use with a GitLab instance (YN ## Documentation and resources -* Official app website: -* Official admin documentation: -* Upstream app code repository: -* YunoHost Store: -* Report a bug: +- Official app website: +- Official admin documentation: +- Upstream app code repository: +- YunoHost Store: +- Report a bug: ## Developer info @@ -39,10 +38,10 @@ Please send your pull request to the [testing branch](https://github.com/YunoHos To try the testing branch, please proceed like that. -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/gitlab-runner_ynh/tree/testing --debug or sudo yunohost app upgrade gitlab-runner -u https://github.com/YunoHost-Apps/gitlab-runner_ynh/tree/testing --debug ``` -**More info regarding app packaging:** \ No newline at end of file +**More info regarding app packaging:** From 203bfba89a878cddc15d9cce1329baebd80c85d1 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 4 Apr 2024 11:34:28 +0000 Subject: [PATCH 3/4] Auto-update READMEs --- ALL_README.md | 6 ++++++ README.md | 13 +++++++------ README_eu.md | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ README_fr.md | 30 +++++++++++++++--------------- README_gl.md | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 124 insertions(+), 21 deletions(-) create mode 100644 ALL_README.md create mode 100644 README_eu.md create mode 100644 README_gl.md diff --git a/ALL_README.md b/ALL_README.md new file mode 100644 index 0000000..77b7509 --- /dev/null +++ b/ALL_README.md @@ -0,0 +1,6 @@ +# All available README files by language + +- [Read the README in English](README.md) +- [Irakurri README euskaraz](README_eu.md) +- [Lire le README en français](README_fr.md) +- [Le o README en galego](README_gl.md) diff --git a/README.md b/README.md index df9b6a5..5074e11 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -9,15 +9,16 @@ It shall NOT be edited by hand. [![Install GitLab Runner with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=gitlab-runner) -*[Lire ce readme en français.](./README_fr.md)* +*[Read this README in other languages.](./ALL_README.md)* -> *This package allows you to install GitLab Runner quickly and simply on a YunoHost server. -If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* +> *This package allows you to install GitLab Runner quickly and simply on a YunoHost server.* +> *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.* ## Overview GitLab Runner is a continuous integration tool to use with a GitLab instance (YNH or not). + **Shipped version:** 16.10.0~ynh1 ## Screenshots @@ -34,9 +35,9 @@ GitLab Runner is a continuous integration tool to use with a GitLab instance (YN ## Developer info -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/gitlab-runner_ynh/tree/testing). +Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/gitlab-runner_ynh/tree/testing). -To try the testing branch, please proceed like that. +To try the `testing` branch, please proceed like that: ```bash sudo yunohost app install https://github.com/YunoHost-Apps/gitlab-runner_ynh/tree/testing --debug diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 0000000..eb2efa5 --- /dev/null +++ b/README_eu.md @@ -0,0 +1,48 @@ + + +# GitLab Runner YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/gitlab-runner.svg)](https://dash.yunohost.org/appci/app/gitlab-runner) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/gitlab-runner.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/gitlab-runner.maintain.svg) + +[![Instalatu GitLab Runner YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=gitlab-runner) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek GitLab Runner YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + +GitLab Runner is a continuous integration tool to use with a GitLab instance (YNH or not). + + +**Paketatutako bertsioa:** 16.10.0~ynh1 + +## Pantaila-argazkiak + +![GitLab Runner(r)en pantaila-argazkia](./doc/screenshots/ci-cd-test-deploy-illustration_2x.png) + +## Dokumentazioa eta baliabideak + +- Aplikazioaren webgune ofiziala: +- Administratzaileen dokumentazio ofiziala: +- Jatorrizko aplikazioaren kode-gordailua: +- YunoHost Denda: +- Eman errore baten berri: + +## Garatzaileentzako informazioa + +Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/gitlab-runner_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/gitlab-runner_ynh/tree/testing --debug +edo +sudo yunohost app upgrade gitlab-runner -u https://github.com/YunoHost-Apps/gitlab-runner_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_fr.md b/README_fr.md index 38774ba..40f15e0 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,6 +1,6 @@ # GitLab Runner pour YunoHost @@ -9,17 +9,17 @@ It shall NOT be edited by hand. [![Installer GitLab Runner avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=gitlab-runner) -*[Read this readme in english.](./README.md)* +*[Lire le README dans d'autres langues.](./ALL_README.md)* -> *Ce package vous permet d’installer GitLab Runner 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.* +> *Ce package vous permet d’installer GitLab Runner rapidement et simplement sur un serveur YunoHost.* +> *Si vous n’avez pas YunoHost, consultez [ce guide](https://yunohost.org/install) pour savoir comment l’installer et en profiter.* ## Vue d’ensemble GitLab Runner est un outil d'intégration continue à utiliser avec une instance GitLab (YNH ou non). -**Version incluse :** 16.9.0~ynh1 +**Version incluse :** 16.10.0~ynh1 ## Captures d’écran @@ -27,22 +27,22 @@ GitLab Runner est un outil d'intégration continue à utiliser avec une instance ## Documentations et ressources -* Site officiel de l’app : -* Documentation officielle de l’admin : -* Dépôt de code officiel de l’app : -* YunoHost Store: -* Signaler un bug : +- Site officiel de l’app : +- Documentation officielle de l’admin : +- Dépôt de code officiel de l’app : +- YunoHost Store : +- Signaler un bug : ## Informations pour les développeurs -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/gitlab-runner_ynh/tree/testing). +Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/gitlab-runner_ynh/tree/testing). -Pour essayer la branche testing, procédez comme suit. +Pour essayer la branche `testing`, procédez comme suit : -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/gitlab-runner_ynh/tree/testing --debug ou sudo yunohost app upgrade gitlab-runner -u https://github.com/YunoHost-Apps/gitlab-runner_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** \ No newline at end of file +**Plus d’infos sur le packaging d’applications :** diff --git a/README_gl.md b/README_gl.md new file mode 100644 index 0000000..60efb74 --- /dev/null +++ b/README_gl.md @@ -0,0 +1,48 @@ + + +# GitLab Runner para YunoHost + +[![Nivel de integración](https://dash.yunohost.org/integration/gitlab-runner.svg)](https://dash.yunohost.org/appci/app/gitlab-runner) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/gitlab-runner.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/gitlab-runner.maintain.svg) + +[![Instalar GitLab Runner con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=gitlab-runner) + +*[Le este README en outros idiomas.](./ALL_README.md)* + +> *Este paquete permíteche instalar GitLab Runner de xeito rápido e doado nun servidor YunoHost.* +> *Se non usas YunoHost, le a [documentación](https://yunohost.org/install) para saber como instalalo.* + +## Vista xeral + +GitLab Runner is a continuous integration tool to use with a GitLab instance (YNH or not). + + +**Versión proporcionada:** 16.10.0~ynh1 + +## Capturas de pantalla + +![Captura de pantalla de GitLab Runner](./doc/screenshots/ci-cd-test-deploy-illustration_2x.png) + +## Documentación e recursos + +- Web oficial da app: +- Documentación oficial para admin: +- Repositorio de orixe do código: +- Tenda YunoHost: +- Informar dun problema: + +## Info de desenvolvemento + +Envía a túa colaboración á [rama `testing`](https://github.com/YunoHost-Apps/gitlab-runner_ynh/tree/testing). + +Para probar a rama `testing`, procede deste xeito: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/gitlab-runner_ynh/tree/testing --debug +ou +sudo yunohost app upgrade gitlab-runner -u https://github.com/YunoHost-Apps/gitlab-runner_ynh/tree/testing --debug +``` + +**Máis info sobre o empaquetado da app:** From 74c24d929c527947389983dacabe3c8314ed14ca Mon Sep 17 00:00:00 2001 From: Kayou Date: Thu, 4 Apr 2024 13:51:02 +0200 Subject: [PATCH 4/4] fix https://github.com/YunoHost-Apps/gitlab-runner_ynh/issues/104, start the docker service if it's not active --- scripts/install | 5 +++++ scripts/upgrade | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/scripts/install b/scripts/install index 3bd7854..42496f9 100755 --- a/scripts/install +++ b/scripts/install @@ -46,6 +46,11 @@ ynh_app_setting_set --app=$app --key=executor --value=$executor #================================================= ynh_script_progression --message="Setting up source files..." +# Make sure docker is running before installing gitlab-runner +if ! systemctl is-active --quiet docker; then + ynh_systemd_action --service_name=docker --action=restart --line_match="API listen on /run/docker.sock" +fi + tempdir="$(mktemp -d)" ynh_setup_source --dest_dir=$tempdir dpkg -i $tempdir/gitlab-runner.deb diff --git a/scripts/upgrade b/scripts/upgrade index 9cb9f94..eb7a6c9 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -32,6 +32,11 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=1 + # Make sure docker is running before installing gitlab-runner + if ! systemctl is-active --quiet docker; then + ynh_systemd_action --service_name=docker --action=restart --line_match="API listen on /run/docker.sock" + fi + tempdir="$(mktemp -d)" ynh_setup_source --dest_dir=$tempdir dpkg -i $tempdir/gitlab-runner.deb