From dc9d4bb47a1cdbf25f221dcfbc6613f1bf03ea9e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 13 Jun 2020 23:01:38 +0200 Subject: [PATCH 1/3] add badges --- README.md | 15 +++++---------- README_fr.md | 27 +++++++++++---------------- 2 files changed, 16 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 44989c0..c665dcd 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # GitLab Runner for YunoHost -[![Integration level](https://dash.yunohost.org/integration/gitlab-runner.svg)](https://dash.yunohost.org/appci/app/gitlab-runner) -[![Install gitlab-runner with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=gitlab-runner) +[![Integration level](https://dash.yunohost.org/integration/gitlab-runner.svg)](https://dash.yunohost.org/appci/app/gitlab-runner) ![](https://ci-apps.yunohost.org/ci/badges/gitlab-runner.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/gitlab-runner.maintain.svg) +[![Install GitLab Runner with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=gitlab-runner) *[Lire ce readme en français.](./README_fr.md)* -> *This package allow you to install gitlab-runner quickly and simply on a YunoHost server. +> *This package allow you to install GitLab Runner quickly and simply on a YunoHost server. If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* ## Overview @@ -29,17 +29,13 @@ How to configure this app: by the admin panel of GitLab or the settings "CI/CD" #### Supported architectures -* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/gitlab-runner%20%28Community%29.svg)](https://ci-apps.yunohost.org/ci/apps/gitlab-runner/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/gitlab-runner%20%28Community%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/gitlab-runner/) -* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/gitlab-runner%20%28Community%29.svg)](https://ci-stretch.nohost.me/ci/apps/gitlab-runner/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/gitlab-runner%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/gitlab-runner/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/gitlab-runner%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/gitlab-runner/) ## Additional information * To retrieve the information to be provided to the installation such as the `token` or the `gitlab's url` you must go here: `Settings->CI/CD->Runners->"Set up a specific Runner manually"` in the project or admin section of the GitLab instance to link to this runner. -**More information on the documentation page:** -https://yunohost.org/packaging_apps - ## Links * Report a bug: https://github.com/YunoHost-Apps/gitlab-runner_ynh/issues @@ -51,7 +47,6 @@ https://yunohost.org/packaging_apps Developers info ---------------- -**Only if you want to use a testing branch for coding, instead of merging directly into master.** Please do 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. diff --git a/README_fr.md b/README_fr.md index abdd25a..799916d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,17 +1,17 @@ # GitLab Runner pour YunoHost -[![Integration level](https://dash.yunohost.org/integration/gitlab-runner.svg)](https://dash.yunohost.org/appci/app/gitlab-runner) -[![Install gitlab-runner with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=gitlab-runner) +[![Integration level](https://dash.yunohost.org/integration/gitlab-runner.svg)](https://dash.yunohost.org/appci/app/gitlab-runner) ![](https://ci-apps.yunohost.org/ci/badges/gitlab-runner.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/gitlab-runner.maintain.svg) +[![Installer GitLab Runner avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=gitlab-runner) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer gitlab-runner rapidement et simplement sur un serveur Yunohost. +> *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.* ## Vue d'ensemble GitLab Runner est un outil d'intégration continue à utiliser avec une instance GitLab (YNH ou non). -**Version incluse:** 13.0.0 +**Version incluse :** 13.0.0 ## Captures d'écran @@ -23,36 +23,31 @@ Comment configurer cette application: via le panneau d'administration de GitLab ## Documentation - * Documentation officielle: https://docs.gitlab.com/runner/ + * Documentation officielle : https://docs.gitlab.com/runner/ ## Caractéristiques spécifiques YunoHost #### Supported architectures -* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/gitlab-runner%20%28Community%29.svg)](https://ci-apps.yunohost.org/ci/apps/gitlab-runner/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/gitlab-runner%20%28Community%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/gitlab-runner/) -* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/gitlab-runner%20%28Community%29.svg)](https://ci-stretch.nohost.me/ci/apps/gitlab-runner/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/gitlab-runner%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/gitlab-runner/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/gitlab-runner%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/gitlab-runner/) ## Informations additionnelles -* Pour récupérer les informations à fournir à l'installation comme le `token` ou `l'url gitlab` vous devez vous rendre ici: `Settings->CI/CD->Runners->"Set up a specific Runner manually"` dans le projet +* Pour récupérer les informations à fournir à l'installation comme le `token` ou `l'url gitlab` vous devez vous rendre ici : `Settings->CI/CD->Runners->"Set up a specific Runner manually"` dans le projet ou la section admin de l'instance GitLab à relier à ce runner. -**Plus d'informations sur la page de documentation:** -https://yunohost.org/packaging_apps - ## Links - * Signaler un bug: https://github.com/YunoHost-Apps/gitlab-runner_ynh/issues - * Site de l'application: https://about.gitlab.com/product/continuous-integration/ - * Site web YunoHost: https://yunohost.org/ + * Signaler un bug : https://github.com/YunoHost-Apps/gitlab-runner_ynh/issues + * Site de l'application : https://about.gitlab.com/product/continuous-integration/ + * Site web YunoHost : https://yunohost.org/ --- Informations pour les développeurs ---------------- -**Seulement si vous voulez utiliser une branche de test pour le codage, au lieu de fusionner directement dans la banche principale.** 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. From dada1e24efe0706204892ae28b2ca706d02ed305 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 13 Jun 2020 23:03:15 +0200 Subject: [PATCH 2/3] remove now official helpers --- manifest.json | 6 +- scripts/_common.sh | 2 - scripts/_experimental.sh | 177 --------------------------------------- scripts/install | 1 - scripts/remove | 1 - scripts/restore | 1 - 6 files changed, 3 insertions(+), 185 deletions(-) delete mode 100644 scripts/_experimental.sh diff --git a/manifest.json b/manifest.json index c44e391..140641e 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "gitlab-runner", "packaging_format": 1, "description": { - "en": "GitLab Runner is a continuous integration tool to use with a GitLab instance (YNH or not).", - "fr": "GitLab Runner est un outil d'intégration continue à utiliser avec une instance GitLab (YNH ou non)." + "en": "Continuous integration tool to use with a GitLab instance (YNH or not).", + "fr": "Outil d'intégration continue à utiliser avec une instance GitLab (YNH ou non)." }, "version": "13.0.0~ynh1", "url": "https://gitlab.com/gitlab-org/gitlab-runner", @@ -14,7 +14,7 @@ "email": "pierre@kayou.io" }, "requirements": { - "yunohost": ">= 3.4" + "yunohost": ">= 3.8.1" }, "multi_instance": false, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index 997ab9b..b511496 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -92,8 +92,6 @@ ynh_backup_before_action () { # EXPERIMENTAL HELPERS #================================================= -# Moved to _experimental.sh because of a bug of linter - #================================================= # FUTURE OFFICIAL HELPERS #================================================= diff --git a/scripts/_experimental.sh b/scripts/_experimental.sh deleted file mode 100644 index 6ebdc18..0000000 --- a/scripts/_experimental.sh +++ /dev/null @@ -1,177 +0,0 @@ -#!/bin/bash - -#================================================= -# EXPERIMENTAL HELPERS -#================================================= - -# Pin a repository. -# -# usage: ynh_pin_repo --package=packages --pin=pin_filter --priority=priority_value [--name=name] [--append] -# | arg: -p, --package - Packages concerned by the pin. Or all, *. -# | arg: -i, --pin - Filter for the pin. -# | arg: -p, --priority - Priority for the pin -# | arg: -n, --name - Name for the files for this repo, $app as default value. -# | arg: -a, --append - Do not overwrite existing files. -# -# See https://manpages.debian.org/stretch/apt/apt_preferences.5.en.html for information about pinning. -# -ynh_pin_repo () { - # Declare an array to define the options of this helper. - local legacy_args=pirna - declare -Ar args_array=( [p]=package= [i]=pin= [r]=priority= [n]=name= [a]=append ) - local package - local pin - local priority - local name - local append - # Manage arguments with getopts - ynh_handle_getopts_args "$@" - package="${package:-*}" - priority=${priority:-50} - name="${name:-$app}" - append=${append:-0} - - if [ $append -eq 1 ] - then - append="tee -a" - else - append="tee" - fi - - mkdir -p "/etc/apt/preferences.d" - echo "Package: $package -Pin: $pin -Pin-Priority: $priority" \ - | $append "/etc/apt/preferences.d/$name" -} - -# Add a repository. -# -# usage: ynh_add_repo --uri=uri --suite=suite --component=component [--name=name] [--append] -# | arg: -u, --uri - Uri of the repository. -# | arg: -s, --suite - Suite of the repository. -# | arg: -c, --component - Component of the repository. -# | arg: -n, --name - Name for the files for this repo, $app as default value. -# | arg: -a, --append - Do not overwrite existing files. -# -# Example for a repo like deb http://forge.yunohost.org/debian/ stretch stable -# uri suite component -# ynh_add_repo --uri=http://forge.yunohost.org/debian/ --suite=stretch --component=stable -# -ynh_add_repo () { - # Declare an array to define the options of this helper. - local legacy_args=uscna - declare -Ar args_array=( [u]=uri= [s]=suite= [c]=component= [n]=name= [a]=append ) - local uri - local suite - local component - local name - local append - # Manage arguments with getopts - ynh_handle_getopts_args "$@" - name="${name:-$app}" - append=${append:-0} - - if [ $append -eq 1 ] - then - append="tee -a" - else - append="tee" - fi - - mkdir -p "/etc/apt/sources.list.d" - # Add the new repo in sources.list.d - echo "deb $uri $suite $component" \ - | $append "/etc/apt/sources.list.d/$name.list" -} - -# Add an extra repository correctly, pin it and get the key. -# -# usage: ynh_install_extra_repo --repo="repo" [--key=key_url] [--name=name] [--append] -# | arg: -r, --repo - Complete url of the extra repository. -# | arg: -k, --key - url to get the public key. -# | arg: -n, --name - Name for the files for this repo, $app as default value. -# | arg: -a, --append - Do not overwrite existing files. -ynh_install_extra_repo () { - # Declare an array to define the options of this helper. - local legacy_args=rkna - declare -Ar args_array=( [r]=repo= [k]=key= [n]=name= [a]=append ) - local repo - local key - local name - local append - # Manage arguments with getopts - ynh_handle_getopts_args "$@" - name="${name:-$app}" - append=${append:-0} - key=${key:-0} - - if [ $append -eq 1 ] - then - append="--append" - wget_append="tee -a" - else - append="" - wget_append="tee" - fi - - # Split the repository into uri, suite and components. - # Remove "deb " at the beginning of the repo. - repo="${repo#deb }" - - # Get the uri - local uri="$(echo "$repo" | awk '{ print $1 }')" - - # Get the suite - local suite="$(echo "$repo" | awk '{ print $2 }')" - - # Get the components - local component="${repo##$uri $suite }" - - # Add the repository into sources.list.d - ynh_add_repo --uri="$uri" --suite="$suite" --component="$component" --name="$name" $append - - # Pin the new repo with the default priority, so it won't be used for upgrades. - # Build $pin from the uri without http and any sub path - local pin="${uri#*://}" - pin="${pin%%/*}" - ynh_pin_repo --package="*" --pin="origin \"$pin\"" --name="$name" $append - - # Get the public key for the repo - if [ -n "$key" ] - then - mkdir -p "/etc/apt/trusted.gpg.d" - if [[ "$(basename "$key")" =~ ".asc" ]] - then - local key_ext=asc - else - local key_ext=gpg - fi - wget -q "$key" -O - | gpg --dearmor | $wget_append /etc/apt/trusted.gpg.d/$name.$key_ext > /dev/null - fi - - # Update the list of package with the new repo - ynh_package_update -} - -# Remove an extra repository and the assiociated configuration. -# -# usage: ynh_remove_extra_repo [--name=name] -# | arg: -n, --name - Name for the files for this repo, $app as default value. -ynh_remove_extra_repo () { - # Declare an array to define the options of this helper. - local legacy_args=n - declare -Ar args_array=( [n]=name= ) - local name - # Manage arguments with getopts - ynh_handle_getopts_args "$@" - name="${name:-$app}" - - ynh_secure_remove "/etc/apt/sources.list.d/$name.list" - ynh_secure_remove "/etc/apt/preferences.d/$name" - ynh_secure_remove "/etc/apt/trusted.gpg.d/$name.gpg" - ynh_secure_remove "/etc/apt/trusted.gpg.d/$name.asc" - - # Update the list of package to exclude the old repo - ynh_package_update -} diff --git a/scripts/install b/scripts/install index a8228b6..c039cdf 100755 --- a/scripts/install +++ b/scripts/install @@ -7,7 +7,6 @@ #================================================= source _common.sh -source _experimental.sh source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/remove b/scripts/remove index f69b473..ae8a4f1 100755 --- a/scripts/remove +++ b/scripts/remove @@ -7,7 +7,6 @@ #================================================= source _common.sh -source _experimental.sh source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/restore b/scripts/restore index af8f229..b42b306 100755 --- a/scripts/restore +++ b/scripts/restore @@ -8,7 +8,6 @@ #Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh -source ../settings/scripts/_experimental.sh source /usr/share/yunohost/helpers #================================================= From 7213bcbdf6a719ec47f47b48426df8b6571a669b Mon Sep 17 00:00:00 2001 From: Kay0u Date: Tue, 23 Jun 2020 14:16:04 +0200 Subject: [PATCH 3/3] 13.1.0 --- README.md | 2 +- README_fr.md | 2 +- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index c665dcd..9c25711 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview GitLab Runner is a continuous integration tool to use with a GitLab instance (YNH or not). -**Shipped version:** 13.0.0 +**Shipped version:** 13.1.0 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 799916d..c0dd10e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble GitLab Runner est un outil d'intégration continue à utiliser avec une instance GitLab (YNH ou non). -**Version incluse :** 13.0.0 +**Version incluse:** 13.1.0 ## Captures d'écran diff --git a/manifest.json b/manifest.json index 140641e..c6f0605 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Continuous integration tool to use with a GitLab instance (YNH or not).", "fr": "Outil d'intégration continue à utiliser avec une instance GitLab (YNH ou non)." }, - "version": "13.0.0~ynh1", + "version": "13.1.0~ynh1", "url": "https://gitlab.com/gitlab-org/gitlab-runner", "license": "MIT", "maintainer": { diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index f100996..fff7d0d 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,9 +1,9 @@ -gitlab_runner_version="13.0.0" +gitlab_runner_version="13.1.0" -gitlab_runner_x86_64_source_sha256="94f52d0de6a5d4c7d669df76f096166dac158bee60d6b1e668780245f582a1f9" +gitlab_runner_x86_64_source_sha256="24a966617b2d26ce33c83f6d7f60b0b69c5d53bdd163818ff96a4020fa43b81a" -gitlab_runner_i386_source_sha256="cc5a85b50eae71b3edafe36595563156d390ac70f3871e789774a0363f7aa473" +gitlab_runner_i386_source_sha256="f1f88804f731e41e7888f31ca56b739b1ec222a6648e139519626e48940b9a97" -gitlab_runner_arm_source_sha256="48608be91bc96136502993e178271d35ab9a5dc8de2d8f26e6f6aca40d91a622" +gitlab_runner_arm_source_sha256="cceca3d53f328ae5e06df4018d652052c5433887579cc70702b83310b82f2245" gitlab_runner_filename="gitlab-runner-${gitlab_runner_version}.deb"