From d9516058d9e0c5e0cd074e3dcd149f391449f71a Mon Sep 17 00:00:00 2001 From: Kay0u Date: Thu, 9 Jun 2022 12:51:59 +0200 Subject: [PATCH 1/2] 15.0.0 --- README.md | 4 ++-- README_fr.md | 2 +- check_process | 2 +- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 7782ea7..2a8be19 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:** 14.1.0 +**Shipped version:** 15.0.0 ## Screenshots @@ -45,7 +45,7 @@ Running a Gitlab Runner mandates to choose [an executor](https://docs.gitlab.com * Report a bug: https://github.com/YunoHost-Apps/gitlab-runner_ynh/issues * App website: https://about.gitlab.com/product/continuous-integration/ - * YunoHost website: https://14.1.0 + * YunoHost website: https://yunohost.org/ --- Developers info diff --git a/README_fr.md b/README_fr.md index 7873f71..c6d8991 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:** 14.1.0 +**Version incluse:** 15.0.0 ## Captures d'écran diff --git a/check_process b/check_process index 3ee1793..4bcbf8c 100644 --- a/check_process +++ b/check_process @@ -1,7 +1,7 @@ ;; Test complet ; Manifest gitlab_url="https://gitlab.com/" (GITLAB_URL) - token="B4TvnFAH2DsAaxpp9Unc" (TOKEN) + token="GR1348941_Rew7obt4p9jZyQUtHLx" (TOKEN) docker_image="alpine:latest" (DOCKER_IMAGE) ; Checks pkg_linter=1 diff --git a/manifest.json b/manifest.json index 9442a13..a0fab20 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": "14.1.0~ynh1", + "version": "15.0.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 ae33e54..dc82287 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,9 +1,9 @@ -gitlab_runner_version="14.1.0" +gitlab_runner_version="15.0.0" -gitlab_runner_x86_64_source_sha256="2b400e2a0f8b87253e0997f8ee2bcbaf13d6d3b79f2a1820a4962b72dd207b46" +gitlab_runner_x86_64_source_sha256="0cdf0505fe72d46472f685736ace64fc5b5c7181fcb374d77b04e629bb6eeba5" -gitlab_runner_i386_source_sha256="439fac386cabb01e0c1e8bf2da266cde4140651b39064f038618fc25ded6811c" +gitlab_runner_i386_source_sha256="35bd675a1285f4ce4cd3c1494b59e0fba596ee395d9cf30c527922d969448263" -gitlab_runner_arm_source_sha256="c7f6bf84b151605be4225afe0b29f25d7e54906dd42489998d4b0976c6b85ef8" +gitlab_runner_arm_source_sha256="042ace4be975ecd916747d32e971c8356de90ef50eb2c75d372c5cd5371e2f74" gitlab_runner_filename="gitlab-runner-${gitlab_runner_version}.deb" From 57417c32e38bc3f5426422f53bbbafe4eb9ea55f Mon Sep 17 00:00:00 2001 From: Kay0u Date: Thu, 9 Jun 2022 13:01:20 +0200 Subject: [PATCH 2/2] don't use sudo --- scripts/_common.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 06269bf..3fda983 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -28,12 +28,12 @@ ynh_restore_actionbackup () { if [ $NO_BACKUP_ACTION -eq "0" ] then # Check if an existing backup can be found before removing and restoring the application. - if sudo yunohost backup list | grep -q $app_bck-pre-action$backup_number + if yunohost backup list | grep -q $app_bck-pre-action$backup_number then # Remove the application then restore it - sudo yunohost app remove $app + yunohost app remove $app # Restore the backup - sudo yunohost backup restore $app_bck-pre-action$backup_number --apps $app --force --debug + yunohost backup restore $app_bck-pre-action$backup_number --apps $app --force --debug ynh_die --message="The app was restored to the way it was before the failed action." fi else @@ -63,7 +63,7 @@ ynh_backup_before_action () { if [ $NO_BACKUP_ACTION -eq "0" ] then # Check if a backup already exists with the prefix 1 - if sudo yunohost backup list | grep -q $app_bck-pre-action1 + if yunohost backup list | grep -q $app_bck-pre-action1 then # Prefix becomes 2 to preserve the previous backup backup_number=2 @@ -71,14 +71,14 @@ ynh_backup_before_action () { fi # Create backup - sudo BACKUP_CORE_ONLY=1 yunohost backup create --apps $app --name $app_bck-pre-action$backup_number --debug + BACKUP_CORE_ONLY=1 yunohost backup create --apps $app --name $app_bck-pre-action$backup_number --debug if [ "$?" -eq 0 ] then # If the backup succeeded, remove the previous backup - if sudo yunohost backup list | grep -q $app_bck-pre-action$old_backup_number + if yunohost backup list | grep -q $app_bck-pre-action$old_backup_number then # Remove the previous backup only if it exists - sudo yunohost backup delete $app_bck-pre-action$old_backup_number > /dev/null + yunohost backup delete $app_bck-pre-action$old_backup_number > /dev/null fi else ynh_die --message="Backup failed, the action process was aborted."