From 87ca5cb7ccb96bbce7efdae4d4c1ad0afad6b789 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 9 Nov 2023 13:38:39 +0100
Subject: [PATCH 01/20] v2

---
 conf/aarch64.src   |  7 -----
 conf/amd64.src     |  7 -----
 conf/arm64.src     |  7 -----
 conf/armel.src     |  7 -----
 conf/armhf.src     |  7 -----
 conf/i386.src      |  7 -----
 manifest.toml      | 74 ++++++++++++++++++++++++++++++++++++++++++++++
 scripts/_common.sh | 10 +++----
 scripts/backup     |  8 ++---
 scripts/install    | 22 +++++++-------
 scripts/remove     | 10 +++----
 scripts/restore    | 26 ++++++++--------
 scripts/upgrade    | 20 ++++++-------
 13 files changed, 122 insertions(+), 90 deletions(-)
 delete mode 100644 conf/aarch64.src
 delete mode 100644 conf/amd64.src
 delete mode 100644 conf/arm64.src
 delete mode 100644 conf/armel.src
 delete mode 100644 conf/armhf.src
 delete mode 100644 conf/i386.src
 create mode 100644 manifest.toml

diff --git a/conf/aarch64.src b/conf/aarch64.src
deleted file mode 100644
index 546fe07..0000000
--- a/conf/aarch64.src
+++ /dev/null
@@ -1,7 +0,0 @@
-SOURCE_URL=https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.5.0/downloads/packages/deb/gitlab-runner_aarch64.deb
-SOURCE_SUM=9747f0f82ec099ce34b1b352a9b09fbe237ed710f22c273fe7c08b1a80494b33
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=deb
-SOURCE_IN_SUBDIR=false
-SOURCE_FILENAME=gitlab-runner.deb
-SOURCE_EXTRACT=false
diff --git a/conf/amd64.src b/conf/amd64.src
deleted file mode 100644
index f711c43..0000000
--- a/conf/amd64.src
+++ /dev/null
@@ -1,7 +0,0 @@
-SOURCE_URL=https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.5.0/downloads/packages/deb/gitlab-runner_amd64.deb
-SOURCE_SUM=7b619273ef5b845407dd45a84c7a1e07442493f2d140c94720f6c47c3a403b48
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=deb
-SOURCE_IN_SUBDIR=false
-SOURCE_FILENAME=gitlab-runner.deb
-SOURCE_EXTRACT=false
diff --git a/conf/arm64.src b/conf/arm64.src
deleted file mode 100644
index 1229738..0000000
--- a/conf/arm64.src
+++ /dev/null
@@ -1,7 +0,0 @@
-SOURCE_URL=https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.5.0/downloads/packages/deb/gitlab-runner_arm64.deb
-SOURCE_SUM=de5287caceb49fc78757c41cf9e0b11f8817743c3f1fee94c02bbd60f1656e1a
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=deb
-SOURCE_IN_SUBDIR=false
-SOURCE_FILENAME=gitlab-runner.deb
-SOURCE_EXTRACT=false
diff --git a/conf/armel.src b/conf/armel.src
deleted file mode 100644
index 70fb12b..0000000
--- a/conf/armel.src
+++ /dev/null
@@ -1,7 +0,0 @@
-SOURCE_URL=https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.5.0/downloads/packages/deb/gitlab-runner_armel.deb
-SOURCE_SUM=8d78e75bf8b75b64d86aa5c05df47b0fc7941a7c953a2cf55a487d8c19ca1e10
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=deb
-SOURCE_IN_SUBDIR=false
-SOURCE_FILENAME=gitlab-runner.deb
-SOURCE_EXTRACT=false
diff --git a/conf/armhf.src b/conf/armhf.src
deleted file mode 100644
index 97e4706..0000000
--- a/conf/armhf.src
+++ /dev/null
@@ -1,7 +0,0 @@
-SOURCE_URL=https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.5.0/downloads/packages/deb/gitlab-runner_armhf.deb
-SOURCE_SUM=ff51a7962851c1447c20d4bacc5b3ef2eef038045f9849fde089b4225e67d1ba
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=deb
-SOURCE_IN_SUBDIR=false
-SOURCE_FILENAME=gitlab-runner.deb
-SOURCE_EXTRACT=false
diff --git a/conf/i386.src b/conf/i386.src
deleted file mode 100644
index 45518b7..0000000
--- a/conf/i386.src
+++ /dev/null
@@ -1,7 +0,0 @@
-SOURCE_URL=https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.5.0/downloads/packages/deb/gitlab-runner_i386.deb
-SOURCE_SUM=271b0437223eba292a79b4c427bdbca3c5edd578292149526b2bec5eb27d8c57
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=deb
-SOURCE_IN_SUBDIR=false
-SOURCE_FILENAME=gitlab-runner.deb
-SOURCE_EXTRACT=false
diff --git a/manifest.toml b/manifest.toml
new file mode 100644
index 0000000..e4eefcf
--- /dev/null
+++ b/manifest.toml
@@ -0,0 +1,74 @@
+packaging_format = 2
+
+id = "gitlab-runner"
+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.5.0~ynh1"
+
+maintainers = ["kay0u"]
+
+[upstream]
+license = "MIT"
+website = "https://gitlab.com/gitlab-org/gitlab-runner"
+admindoc = "https://docs.gitlab.com/runner/"
+code = "https://gitlab.com/gitlab-org/gitlab-runner"
+cpe = "???" # FIXME: optional but recommended if relevant, this is meant to contain the Common Platform Enumeration, which is sort of a standard id for applications defined by the NIST. In particular, Yunohost may use this is in the future to easily track CVE (=security reports) related to apps. The CPE may be obtained by searching here: https://nvd.nist.gov/products/cpe/search. For example, for Nextcloud, the CPE is 'cpe:2.3:a:nextcloud:nextcloud' (no need to include the version number)
+fund = "???" # FIXME: optional but recommended (or remove if irrelevant / not applicable). This is meant to be an URL where people can financially support this app, especially when its development is based on volunteers and/or financed by its community. YunoHost may later advertise it in the webadmin.
+
+[integration]
+yunohost = ">= 4.3.0"
+architectures = "all" # FIXME: can be replaced by a list of supported archs using the dpkg --print-architecture nomenclature (amd64/i386/armhf/arm64), for example: ["amd64", "i386"]
+multi_instance = false
+ldap = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "sso" key : the "ldap" key corresponds to wether or not a user *can* login on the app using its YunoHost credentials.
+sso = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "ldap" key : the "sso" key corresponds to wether or not a user is *automatically logged-in* on the app when logged-in on the YunoHost portal.
+disk = "50M" # FIXME: replace with an **estimate** minimum disk requirement. e.g. 20M, 400M, 1G, ...
+ram.build = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ...
+ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ...
+
+[install]
+    [install.gitlab_url]
+    ask.en = "Please enter the GitLab-CI coordinator URL"
+    ask.fr = "Veuillez entrer l'URL du coordinateur GitLab-CI"
+    help.en = "This URL can be retrieved at this location: GitLab Project->Settings->Runner or: Admin Area->Overview->Runners"
+    help.fr = "Cet URL peut être récupéré à cet emplacement : Projet GitLab->Settings->Runner ou : Admin Area->Overview->Runners"
+    type = "string"
+    example = "https://gitlab.com/"
+
+    [install.token]
+    ask.en = "Please enter the GitLab-CI token for this Runner"
+    ask.fr = "Veuillez entrer le jeton GitLab-CI pour ce Runner"
+    help.en = "This token can be retrieved at this location: GitLab Project->Settings->Runner or: Admin Area->Overview->Runners"
+    help.fr = "Ce token peut être récupéré à cet emplacement : Projet GitLab->Settings->Runner ou : Admin Area->Overview->Runners"
+    type = "string"
+    example = "xxx"
+
+    [install.docker_image]
+    ask.en = "Please enter the Docker image"
+    ask.fr = "Veuillez entrer l'image du Docker"
+    type = "string"
+    example = "ruby:2.1"
+    default = "alpine:latest"
+
+[resources]
+        [resources.sources.main]
+        format = "deb"
+        rename = "gitlab-runner.deb"
+        arm64.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.5.0/downloads/packages/deb/gitlab-runner_aarch64.deb"
+        arm64.sha256 = "9747f0f82ec099ce34b1b352a9b09fbe237ed710f22c273fe7c08b1a80494b33"
+        amd64.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.5.0/downloads/packages/deb/gitlab-runner_amd64.deb"
+        amd64.sha256 = "7b619273ef5b845407dd45a84c7a1e07442493f2d140c94720f6c47c3a403b48"
+        armel.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.5.0/downloads/packages/deb/gitlab-runner_armel.deb"
+        armel.sha256 = "8d78e75bf8b75b64d86aa5c05df47b0fc7941a7c953a2cf55a487d8c19ca1e10"
+        armhf.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.5.0/downloads/packages/deb/gitlab-runner_armhf.deb"
+        armhf.sha256 = "ff51a7962851c1447c20d4bacc5b3ef2eef038045f9849fde089b4225e67d1ba"
+        i386.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.5.0/downloads/packages/deb/gitlab-runner_i386.deb"
+        i386.sha256 = "271b0437223eba292a79b4c427bdbca3c5edd578292149526b2bec5eb27d8c57"
+
+
+    [resources.system_user]
+
+    [resources.install_dir]
+
+    [resources.permissions]
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 3fda983..1384d7f 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -5,7 +5,7 @@
 #=================================================
 
 # dependencies used by the app
-pkg_dependencies="ca-certificates git curl tar docker-ce docker-ce-cli containerd.io"
+#REMOVEME? pkg_dependencies="ca-certificates git curl tar docker-ce docker-ce-cli containerd.io"
 
 #=================================================
 # PERSONAL HELPERS
@@ -15,10 +15,10 @@ pkg_dependencies="ca-certificates git curl tar docker-ce docker-ce-cli container
 #
 # usage:
 # ynh_backup_before_action
-# ynh_clean_setup () {
+#REMOVEME? # ynh_clean_setup () {
 # 	ynh_restore_actionbackup
 # }
-# ynh_abort_if_errors
+#REMOVEME? # ynh_abort_if_errors
 ynh_restore_actionbackup () {
 	echo "Action failed." >&2
 	local app_bck=${app//_/-}	# Replace all '_' by '-'
@@ -45,10 +45,10 @@ ynh_restore_actionbackup () {
 #
 # usage:
 # ynh_backup_before_action
-# ynh_clean_setup () {
+#REMOVEME? # ynh_clean_setup () {
 # 	ynh_restore_actionbackup
 # }
-# ynh_abort_if_errors
+#REMOVEME? # ynh_abort_if_errors
 ynh_backup_before_action () {
 	if [ ! -e "/etc/yunohost/apps/$app/scripts/backup" ]
 	then
diff --git a/scripts/backup b/scripts/backup
index a3993da..0a75d8c 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -14,18 +14,18 @@ source /usr/share/yunohost/helpers
 # MANAGE SCRIPT FAILURE
 #=================================================
 
-ynh_clean_setup () {
+#REMOVEME? ynh_clean_setup () {
 	true
 }
 # Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
+#REMOVEME? ynh_abort_if_errors
 
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_print_info --message="Loading installation settings..."
+#REMOVEME? ynh_print_info --message="Loading installation settings..."
 
-app=$YNH_APP_INSTANCE_NAME
+#REMOVEME? app=$YNH_APP_INSTANCE_NAME
 
 #=================================================
 # STANDARD BACKUP STEPS
diff --git a/scripts/install b/scripts/install
index c4d2ff8..597dfe8 100755
--- a/scripts/install
+++ b/scripts/install
@@ -13,26 +13,26 @@ source /usr/share/yunohost/helpers
 # MANAGE SCRIPT FAILURE
 #=================================================
 
-ynh_clean_setup () {
+#REMOVEME? ynh_clean_setup () {
 	true
 }
 # Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
+#REMOVEME? ynh_abort_if_errors
 
 #=================================================
 # RETRIEVE ARGUMENTS FROM THE MANIFEST
 #=================================================
 
-gitlab_url=$YNH_APP_ARG_GITLAB_URL
-token=$YNH_APP_ARG_TOKEN
-docker_image=$YNH_APP_ARG_DOCKER_IMAGE
+#REMOVEME? gitlab_url=$YNH_APP_ARG_GITLAB_URL
+#REMOVEME? token=$YNH_APP_ARG_TOKEN
+#REMOVEME? docker_image=$YNH_APP_ARG_DOCKER_IMAGE
 
-app=$YNH_APP_INSTANCE_NAME
+#REMOVEME? app=$YNH_APP_INSTANCE_NAME
 
 #=================================================
 # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
 #=================================================
-ynh_script_progression --message="Validating installation parameters..."
+#REMOVEME? ynh_script_progression --message="Validating installation parameters..."
 
 config_path=/etc/$app
 test ! -e "$config_path" || ynh_die "This path already contains a folder"
@@ -58,23 +58,23 @@ fi
 #=================================================
 # STORE SETTINGS FROM MANIFEST
 #=================================================
-ynh_script_progression --message="Storing installation settings..."
+#REMOVEME? ynh_script_progression --message="Storing installation settings..."
 
 ynh_app_setting_set --app=$app --key=gitlab_url --value=$gitlab_url
 ynh_app_setting_set --app=$app --key=token --value=$token
 ynh_app_setting_set --app=$app --key=executor --value=$executor
 ynh_app_setting_set --app=$app --key=docker_image --value=$docker_image
-ynh_app_setting_set --app=$app --key=config_path --value=$config_path
+#REMOVEME? ynh_app_setting_set --app=$app --key=config_path --value=$config_path
 
 #=================================================
 # STANDARD MODIFICATIONS
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Installing dependencies..."
+#REMOVEME? ynh_script_progression --message="Installing dependencies..."
 
 ynh_install_extra_repo --repo="https://download.docker.com/linux/debian $(lsb_release -cs) stable" --key="https://download.docker.com/linux/debian/gpg" --name="${app}-docker"
-ynh_install_app_dependencies $pkg_dependencies
+#REMOVEME? ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
diff --git a/scripts/remove b/scripts/remove
index 237ed15..9d4c925 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -12,11 +12,11 @@ source /usr/share/yunohost/helpers
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation settings..."
+#REMOVEME? ynh_script_progression --message="Loading installation settings..."
 
-app=$YNH_APP_INSTANCE_NAME
+#REMOVEME? app=$YNH_APP_INSTANCE_NAME
 
-config_path=$(ynh_app_setting_get --app=$app --key=config_path)
+#REMOVEME? config_path=$(ynh_app_setting_get --app=$app --key=config_path)
 
 #=================================================
 # STANDARD REMOVE
@@ -48,10 +48,10 @@ dpkg --remove $app
 #=================================================
 # REMOVE DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Removing dependencies..."
+#REMOVEME? ynh_script_progression --message="Removing dependencies..."
 
 # Remove metapackage and its dependencies
-ynh_remove_app_dependencies
+#REMOVEME? ynh_remove_app_dependencies
 ynh_remove_extra_repo --name="${app}-docker"
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index ff1a674..87cda98 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -14,30 +14,30 @@ source /usr/share/yunohost/helpers
 # MANAGE SCRIPT FAILURE
 #=================================================
 
-ynh_clean_setup () {
+#REMOVEME? ynh_clean_setup () {
 	true
 }
 # Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
+#REMOVEME? ynh_abort_if_errors
 
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation settings..."
+#REMOVEME? ynh_script_progression --message="Loading installation settings..."
 
-app=$YNH_APP_INSTANCE_NAME
+#REMOVEME? app=$YNH_APP_INSTANCE_NAME
 
-config_path=$(ynh_app_setting_get --app=$app --key=config_path)
-architecture=$(ynh_app_setting_get --app=$app --key=architecture)
-gitlab_url=$(ynh_app_setting_get --app=$app --key=gitlab_url)
-token=$(ynh_app_setting_get --app=$app --key=token)
-executor=$(ynh_app_setting_get --app=$app --key=executor)
-docker_image=$(ynh_app_setting_get --app=$app --key=docker_image)
+#REMOVEME? config_path=$(ynh_app_setting_get --app=$app --key=config_path)
+#REMOVEME? architecture=$(ynh_app_setting_get --app=$app --key=architecture)
+#REMOVEME? gitlab_url=$(ynh_app_setting_get --app=$app --key=gitlab_url)
+#REMOVEME? token=$(ynh_app_setting_get --app=$app --key=token)
+#REMOVEME? executor=$(ynh_app_setting_get --app=$app --key=executor)
+#REMOVEME? docker_image=$(ynh_app_setting_get --app=$app --key=docker_image)
 
 #=================================================
 # CHECK IF THE APP CAN BE RESTORED
 #=================================================
-ynh_script_progression --message="Validating restoration parameters..."
+#REMOVEME? ynh_script_progression --message="Validating restoration parameters..."
 
 test ! -d $config_path \
 	|| ynh_die --message="There is already a directory: $config_path "
@@ -47,11 +47,11 @@ test ! -d $config_path \
 #=================================================
 # REINSTALL DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Reinstalling dependencies..."
+#REMOVEME? ynh_script_progression --message="Reinstalling dependencies..."
 
 # Define and install dependencies
 ynh_install_extra_repo --repo="https://download.docker.com/linux/debian $(lsb_release -cs) stable" --key="https://download.docker.com/linux/debian/gpg" --name="${app}-docker"
-ynh_install_app_dependencies $pkg_dependencies
+#REMOVEME? ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
diff --git a/scripts/upgrade b/scripts/upgrade
index bf7d6dd..486f374 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -12,11 +12,11 @@ source /usr/share/yunohost/helpers
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation settings..."
+#REMOVEME? ynh_script_progression --message="Loading installation settings..."
 
-app=$YNH_APP_INSTANCE_NAME
+#REMOVEME? app=$YNH_APP_INSTANCE_NAME
 
-architecture=$(ynh_app_setting_get --app=$app --key=architecture)
+#REMOVEME? architecture=$(ynh_app_setting_get --app=$app --key=architecture)
 
 #=================================================
 # CHECK VERSION
@@ -28,16 +28,16 @@ upgrade_type=$(ynh_check_app_version_changed)
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================
-ynh_script_progression --message="Backing up the app before upgrading (may take a while)..."
+#REMOVEME? ynh_script_progression --message="Backing up the app before upgrading (may take a while)..."
 
 # Backup the current version of the app
-ynh_backup_before_upgrade
-ynh_clean_setup () {
+#REMOVEME? ynh_backup_before_upgrade
+#REMOVEME? ynh_clean_setup () {
 	# Restore it if the upgrade fails
-	ynh_restore_upgradebackup
+#REMOVEME? 	ynh_restore_upgradebackup
 }
 # Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
+#REMOVEME? ynh_abort_if_errors
 
 #=================================================
 # STANDARD UPGRADE STEPS
@@ -65,10 +65,10 @@ fi
 #=================================================
 # UPGRADE DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Upgrading dependencies..."
+#REMOVEME? ynh_script_progression --message="Upgrading dependencies..."
 
 ynh_install_extra_repo --repo="https://download.docker.com/linux/debian $(lsb_release -cs) stable" --key="https://download.docker.com/linux/debian/gpg" --name="${app}-docker"
-ynh_install_app_dependencies $pkg_dependencies
+#REMOVEME? ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST

From 9c0d18e51842f7653a8e89d9697bb1d667309cee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 9 Nov 2023 13:45:14 +0100
Subject: [PATCH 02/20] v2

---
 .github/workflows/updater.sh          | 145 --------------------------
 .github/workflows/updater.yml         |  49 ---------
 check_process                         |  21 ----
 doc/{DISCLAIMER.md => ADMIN.md}       |   0
 doc/{DISCLAIMER_fr.md => ADMIN_fr.md} |   0
 manifest.json                         |  68 ------------
 manifest.toml                         |  24 +++--
 scripts/backup                        |  17 ---
 scripts/install                       |  38 +------
 scripts/remove                        |  18 ----
 scripts/restore                       |  37 +------
 scripts/upgrade                       |  34 +-----
 tests.toml                            |  20 ++++
 13 files changed, 39 insertions(+), 432 deletions(-)
 delete mode 100644 .github/workflows/updater.sh
 delete mode 100644 .github/workflows/updater.yml
 delete mode 100644 check_process
 rename doc/{DISCLAIMER.md => ADMIN.md} (100%)
 rename doc/{DISCLAIMER_fr.md => ADMIN_fr.md} (100%)
 delete mode 100644 manifest.json
 create mode 100644 tests.toml

diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh
deleted file mode 100644
index 6d8eab8..0000000
--- a/.github/workflows/updater.sh
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/bin/bash
-
-#=================================================
-# PACKAGE UPDATING HELPER
-#=================================================
-
-# This script is meant to be run by GitHub Actions
-# The YunoHost-Apps organisation offers a template Action to run this script periodically
-# Since each app is different, maintainers can adapt its contents so as to perform
-# automatic actions when a new upstream release is detected.
-
-#=================================================
-# FETCHING LATEST RELEASE AND ITS ASSETS
-#=================================================
-
-# Fetching information
-current_version=$(cat manifest.json | jq -j '.version|split("~")[0]')
-# Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions)
-version=$(curl --silent "https://gitlab.com/api/v4/projects/250833/releases" | jq -r '.[] | select( .prerelease != true ) | .tag_name' | sort -V | tail -1)
-assets=($(curl --silent "https://gitlab.com/api/v4/projects/250833/releases" | jq -r '[ .[] | select(.tag_name=="'$version'").assets.links[].direct_asset_url ] | join(" ") | @sh' | tr -d "'"))
-
-# Later down the script, we assume the version has only digits and dots
-# Sometimes the release name starts with a "v", so let's filter it out.
-# You may need more tweaks here if the upstream repository has different naming conventions.
-if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then
-    version=${version:1}
-fi
-
-# Setting up the environment variables
-echo "Current version: $current_version"
-echo "Latest release from upstream: $version"
-echo "VERSION=$version" >> $GITHUB_ENV
-# For the time being, let's assume the script will fail
-echo "PROCEED=false" >> $GITHUB_ENV
-
-# Proceed only if the retrieved version is greater than the current one
-if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then
-    echo "::warning ::No new version available"
-    exit 0
-# Proceed only if a PR for this new version does not already exist
-elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then
-    echo "::warning ::A branch already exists for this update"
-    exit 0
-fi
-
-# Each release can hold multiple assets (e.g. binaries for different architectures, source code, etc.)
-echo "${#assets[@]} available asset(s)"
-
-#=================================================
-# UPDATE SOURCE FILES
-#=================================================
-
-# Here we use the $assets variable to get the resources published in the upstream release.
-# Here is an example for Grav, it has to be adapted in accordance with how the upstream releases look like.
-
-# Let's loop over the array of assets URLs
-for asset_url in ${assets[@]}; do
-
-echo "Handling asset at $asset_url"
-
-# Assign the asset to a source file in conf/ directory
-# Here we base the source file name upon a unique keyword in the assets url (admin vs. update)
-# Leave $src empty to ignore the asset
-case $asset_url in
-  *"arm64.deb"*)
-    src="arm64"
-    ;;
-  *"aarch64.deb"*)
-    src="aarch64"
-    ;;
-  *"armhf.deb"*)
-    src="armhf"
-    ;;
-  *"armel.deb"*)
-    src="armel"
-    ;;
-  *"i386.deb"*)
-    src="i386"
-    ;;
-  *"amd64.deb"*)
-    src="amd64"
-    ;;
-  *)
-    src=""
-    ;;
-esac
-
-# If $src is not empty, let's process the asset
-if [ ! -z "$src" ]; then
-
-# Create the temporary directory
-tempdir="$(mktemp -d)"
-
-# Download sources and calculate checksum
-filename=${asset_url##*/}
-curl --silent -4 -L $asset_url -o "$tempdir/$filename"
-checksum=$(sha256sum "$tempdir/$filename" | head -c 64)
-
-# Delete temporary directory
-rm -rf $tempdir
-
-# Get extension
-if [[ $filename == *.tar.gz ]]; then
-  extension=tar.gz
-else
-  extension=${filename##*.}
-fi
-
-# Rewrite source file
-cat <<EOT > conf/$src.src
-SOURCE_URL=$asset_url
-SOURCE_SUM=$checksum
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=$extension
-SOURCE_IN_SUBDIR=false
-SOURCE_FILENAME=gitlab-runner.deb
-SOURCE_EXTRACT=false
-EOT
-echo "... conf/$src.src updated"
-
-else
-echo "... asset ignored"
-fi
-
-done
-
-#=================================================
-# SPECIFIC UPDATE STEPS
-#=================================================
-
-# Any action on the app's source code can be done.
-# The GitHub Action workflow takes care of committing all changes after this script ends.
-
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-
-# Replace new version in manifest
-echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json
-
-# No need to update the README, yunohost-bot takes care of it
-
-# The Action will proceed only if the PROCEED environment variable is set to true
-echo "PROCEED=true" >> $GITHUB_ENV
-exit 0
diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml
deleted file mode 100644
index a56d7cb..0000000
--- a/.github/workflows/updater.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-# This workflow allows GitHub Actions to automagically update your app whenever a new upstream release is detected.
-# You need to enable Actions in your repository settings, and fetch this Action from the YunoHost-Apps organization.
-# This file should be enough by itself, but feel free to tune it to your needs.
-# It calls updater.sh, which is where you should put the app-specific update steps.
-name: Check for new upstream releases
-on:
-  # Allow to manually trigger the workflow
-  workflow_dispatch:
-  # Run it every day at 6:00 UTC
-  schedule:
-    - cron:  '0 6 * * *'
-jobs:
-  updater:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Fetch the source code
-        uses: actions/checkout@v3
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Run the updater script
-        id: run_updater
-        run: |
-          # Setting up Git user
-          git config --global user.name 'yunohost-bot'
-          git config --global user.email 'yunohost-bot@users.noreply.github.com'
-          # Run the updater script
-          /bin/bash .github/workflows/updater.sh
-      - name: Commit changes
-        id: commit
-        if: ${{ env.PROCEED == 'true' }}
-        run: |
-          git commit -am "Upgrade to v$VERSION"
-      - name: Create Pull Request
-        id: cpr
-        if: ${{ env.PROCEED == 'true' }}
-        uses: peter-evans/create-pull-request@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: Update to version ${{ env.VERSION }}
-          committer: 'yunohost-bot <yunohost-bot@users.noreply.github.com>'
-          author: 'yunohost-bot <yunohost-bot@users.noreply.github.com>'
-          signoff: false
-          base: testing
-          branch: ci-auto-update-v${{ env.VERSION }}
-          delete-branch: true
-          title: 'Upgrade to version ${{ env.VERSION }}'
-          body: |
-            Upgrade to v${{ env.VERSION }}
-          draft: false
diff --git a/check_process b/check_process
deleted file mode 100644
index 03f10cd..0000000
--- a/check_process
+++ /dev/null
@@ -1,21 +0,0 @@
-;; Test complet
-	; Manifest
-		gitlab_url="https://gitlab.com/"	(GITLAB_URL)
-		token="GR1348941_Rew7obt4p9jZyQUtHLx"	(TOKEN)
-		docker_image="alpine:latest"	(DOCKER_IMAGE)
-	; Checks
-		pkg_linter=1
-		setup_sub_dir=0
-		setup_root=0
-		setup_nourl=1
-		setup_private=0
-		setup_public=0
-		upgrade=1
-		backup_restore=1
-		multi_instance=0
-		incorrect_path=0
-		port_already_use=0
-		change_url=0
-;;; Options
-Email=
-Notification=none
diff --git a/doc/DISCLAIMER.md b/doc/ADMIN.md
similarity index 100%
rename from doc/DISCLAIMER.md
rename to doc/ADMIN.md
diff --git a/doc/DISCLAIMER_fr.md b/doc/ADMIN_fr.md
similarity index 100%
rename from doc/DISCLAIMER_fr.md
rename to doc/ADMIN_fr.md
diff --git a/manifest.json b/manifest.json
deleted file mode 100644
index ad5b8af..0000000
--- a/manifest.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-    "name": "GitLab Runner",
-    "id": "gitlab-runner",
-    "packaging_format": 1,
-    "description": {
-        "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": "16.5.0~ynh1",
-    "url": "https://gitlab.com/gitlab-org/gitlab-runner",
-    "upstream": {
-        "license": "MIT",
-        "website": "https://gitlab.com/gitlab-org/gitlab-runner",
-        "admindoc": "https://docs.gitlab.com/runner/",
-        "code": "https://gitlab.com/gitlab-org/gitlab-runner",
-        "cpe": "cpe:2.3:a:gitlab:runner"
-    },
-    "license": "MIT",
-    "maintainer": {
-        "name": "kay0u",
-        "email": "pierre@kayou.io"
-    },
-    "requirements": {
-        "yunohost": ">= 4.3.0"
-    },
-    "multi_instance": false,
-    "services": [],
-    "arguments": {
-        "install": [
-            {
-                "name": "gitlab_url",
-                "type": "string",
-                "ask": {
-                    "en": "Please enter the GitLab-CI coordinator URL",
-                    "fr": "Veuillez entrer l'URL du coordinateur GitLab-CI"
-                },
-                "help": {
-                    "en": "This URL can be retrieved at this location: GitLab Project->Settings->Runner or: Admin Area->Overview->Runners",
-                    "fr": "Cet URL peut être récupéré à cet emplacement : Projet GitLab->Settings->Runner ou : Admin Area->Overview->Runners"
-                },
-                "example": "https://gitlab.com/"
-            },
-            {
-                "name": "token",
-                "type": "string",
-                "ask": {
-                    "en": "Please enter the GitLab-CI token for this Runner",
-                    "fr": "Veuillez entrer le jeton GitLab-CI pour ce Runner"
-                },
-                "help": {
-                    "en": "This token can be retrieved at this location: GitLab Project->Settings->Runner or: Admin Area->Overview->Runners",
-                    "fr": "Ce token peut être récupéré à cet emplacement : Projet GitLab->Settings->Runner ou : Admin Area->Overview->Runners"
-                },
-                "example": "xxx"
-            },
-            {
-                "name": "docker_image",
-                "type": "string",
-                "ask": {
-                    "en": "Please enter the Docker image",
-                    "fr": "Veuillez entrer l'image du Docker"
-                },
-                "example": "ruby:2.1",
-                "default": "alpine:latest"
-            }
-        ]
-    }
-}
diff --git a/manifest.toml b/manifest.toml
index e4eefcf..cc758c3 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -14,18 +14,16 @@ license = "MIT"
 website = "https://gitlab.com/gitlab-org/gitlab-runner"
 admindoc = "https://docs.gitlab.com/runner/"
 code = "https://gitlab.com/gitlab-org/gitlab-runner"
-cpe = "???" # FIXME: optional but recommended if relevant, this is meant to contain the Common Platform Enumeration, which is sort of a standard id for applications defined by the NIST. In particular, Yunohost may use this is in the future to easily track CVE (=security reports) related to apps. The CPE may be obtained by searching here: https://nvd.nist.gov/products/cpe/search. For example, for Nextcloud, the CPE is 'cpe:2.3:a:nextcloud:nextcloud' (no need to include the version number)
-fund = "???" # FIXME: optional but recommended (or remove if irrelevant / not applicable). This is meant to be an URL where people can financially support this app, especially when its development is based on volunteers and/or financed by its community. YunoHost may later advertise it in the webadmin.
 
 [integration]
-yunohost = ">= 4.3.0"
-architectures = "all" # FIXME: can be replaced by a list of supported archs using the dpkg --print-architecture nomenclature (amd64/i386/armhf/arm64), for example: ["amd64", "i386"]
+yunohost = ">= 11.2"
+architectures = ["amd64", "i386", "armhf", "arm64"]
 multi_instance = false
-ldap = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "sso" key : the "ldap" key corresponds to wether or not a user *can* login on the app using its YunoHost credentials.
-sso = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "ldap" key : the "sso" key corresponds to wether or not a user is *automatically logged-in* on the app when logged-in on the YunoHost portal.
-disk = "50M" # FIXME: replace with an **estimate** minimum disk requirement. e.g. 20M, 400M, 1G, ...
-ram.build = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ...
-ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ...
+ldap = "not_relevant"
+sso = "not_relevant"
+disk = "50M"
+ram.build = "50M"
+ram.runtime = "50M"
 
 [install]
     [install.gitlab_url]
@@ -72,3 +70,11 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen
     [resources.install_dir]
 
     [resources.permissions]
+    main.url = "/"
+    
+    [resources.apt]
+    packages = "ca-certificates, git, curl, tar"
+
+    extras.docker.repo = "https://download.docker.com/linux/debian bullseye stable"
+    extras.docker.key = "https://download.docker.com/linux/debian/gpg"
+    extras.docker.packages = "docker-ce, docker-ce-cli, containerd.io"
diff --git a/scripts/backup b/scripts/backup
index 0a75d8c..859bec0 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -10,23 +10,6 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-#REMOVEME? ynh_clean_setup () {
-	true
-}
-# Exit if an error occurs during the execution of the script
-#REMOVEME? ynh_abort_if_errors
-
-#=================================================
-# LOAD SETTINGS
-#=================================================
-#REMOVEME? ynh_print_info --message="Loading installation settings..."
-
-#REMOVEME? app=$YNH_APP_INSTANCE_NAME
-
 #=================================================
 # STANDARD BACKUP STEPS
 #=================================================
diff --git a/scripts/install b/scripts/install
index 597dfe8..4b912fa 100755
--- a/scripts/install
+++ b/scripts/install
@@ -9,26 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-#REMOVEME? ynh_clean_setup () {
-	true
-}
-# Exit if an error occurs during the execution of the script
-#REMOVEME? ynh_abort_if_errors
-
-#=================================================
-# RETRIEVE ARGUMENTS FROM THE MANIFEST
-#=================================================
-
-#REMOVEME? gitlab_url=$YNH_APP_ARG_GITLAB_URL
-#REMOVEME? token=$YNH_APP_ARG_TOKEN
-#REMOVEME? docker_image=$YNH_APP_ARG_DOCKER_IMAGE
-
-#REMOVEME? app=$YNH_APP_INSTANCE_NAME
-
 #=================================================
 # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
 #=================================================
@@ -58,23 +38,9 @@ fi
 #=================================================
 # STORE SETTINGS FROM MANIFEST
 #=================================================
-#REMOVEME? ynh_script_progression --message="Storing installation settings..."
+ynh_script_progression --message="Storing installation settings..."
 
-ynh_app_setting_set --app=$app --key=gitlab_url --value=$gitlab_url
-ynh_app_setting_set --app=$app --key=token --value=$token
 ynh_app_setting_set --app=$app --key=executor --value=$executor
-ynh_app_setting_set --app=$app --key=docker_image --value=$docker_image
-#REMOVEME? ynh_app_setting_set --app=$app --key=config_path --value=$config_path
-
-#=================================================
-# STANDARD MODIFICATIONS
-#=================================================
-# INSTALL DEPENDENCIES
-#=================================================
-#REMOVEME? ynh_script_progression --message="Installing dependencies..."
-
-ynh_install_extra_repo --repo="https://download.docker.com/linux/debian $(lsb_release -cs) stable" --key="https://download.docker.com/linux/debian/gpg" --name="${app}-docker"
-#REMOVEME? ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
@@ -111,7 +77,7 @@ do
 		--registration-token "$tok" \
 		--executor "$executor" \
 		--docker-image "$docker_img" \
-		--description "Yunohost runner" \
+		--description "YunoHost runner" \
 		--tag-list "$executor,$YNH_ARCH" \
 		--run-untagged \
 		--locked="false"
diff --git a/scripts/remove b/scripts/remove
index 9d4c925..7d569af 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -9,15 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# LOAD SETTINGS
-#=================================================
-#REMOVEME? ynh_script_progression --message="Loading installation settings..."
-
-#REMOVEME? app=$YNH_APP_INSTANCE_NAME
-
-#REMOVEME? config_path=$(ynh_app_setting_get --app=$app --key=config_path)
-
 #=================================================
 # STANDARD REMOVE
 #=================================================
@@ -45,15 +36,6 @@ ynh_script_progression --message="Removing Gitlab Runner"
 
 dpkg --remove $app
 
-#=================================================
-# REMOVE DEPENDENCIES
-#=================================================
-#REMOVEME? ynh_script_progression --message="Removing dependencies..."
-
-# Remove metapackage and its dependencies
-#REMOVEME? ynh_remove_app_dependencies
-ynh_remove_extra_repo --name="${app}-docker"
-
 #=================================================
 # REMOVE VARIOUS FILES
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 87cda98..f213ace 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -10,49 +10,14 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-#REMOVEME? ynh_clean_setup () {
-	true
-}
-# Exit if an error occurs during the execution of the script
-#REMOVEME? ynh_abort_if_errors
-
-#=================================================
-# LOAD SETTINGS
-#=================================================
-#REMOVEME? ynh_script_progression --message="Loading installation settings..."
-
-#REMOVEME? app=$YNH_APP_INSTANCE_NAME
-
-#REMOVEME? config_path=$(ynh_app_setting_get --app=$app --key=config_path)
-#REMOVEME? architecture=$(ynh_app_setting_get --app=$app --key=architecture)
-#REMOVEME? gitlab_url=$(ynh_app_setting_get --app=$app --key=gitlab_url)
-#REMOVEME? token=$(ynh_app_setting_get --app=$app --key=token)
-#REMOVEME? executor=$(ynh_app_setting_get --app=$app --key=executor)
-#REMOVEME? docker_image=$(ynh_app_setting_get --app=$app --key=docker_image)
-
 #=================================================
 # CHECK IF THE APP CAN BE RESTORED
 #=================================================
-#REMOVEME? ynh_script_progression --message="Validating restoration parameters..."
+ynh_script_progression --message="Validating restoration parameters..."
 
 test ! -d $config_path \
 	|| ynh_die --message="There is already a directory: $config_path "
 
-#=================================================
-# STANDARD RESTORATION STEPS
-#=================================================
-# REINSTALL DEPENDENCIES
-#=================================================
-#REMOVEME? ynh_script_progression --message="Reinstalling dependencies..."
-
-# Define and install dependencies
-ynh_install_extra_repo --repo="https://download.docker.com/linux/debian $(lsb_release -cs) stable" --key="https://download.docker.com/linux/debian/gpg" --name="${app}-docker"
-#REMOVEME? ynh_install_app_dependencies $pkg_dependencies
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 486f374..934a9b1 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -9,36 +9,12 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# LOAD SETTINGS
-#=================================================
-#REMOVEME? ynh_script_progression --message="Loading installation settings..."
-
-#REMOVEME? app=$YNH_APP_INSTANCE_NAME
-
-#REMOVEME? architecture=$(ynh_app_setting_get --app=$app --key=architecture)
-
 #=================================================
 # CHECK VERSION
 #=================================================
-ynh_script_progression --message="Checking version..."
 
 upgrade_type=$(ynh_check_app_version_changed)
 
-#=================================================
-# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
-#=================================================
-#REMOVEME? ynh_script_progression --message="Backing up the app before upgrading (may take a while)..."
-
-# Backup the current version of the app
-#REMOVEME? ynh_backup_before_upgrade
-#REMOVEME? ynh_clean_setup () {
-	# Restore it if the upgrade fails
-#REMOVEME? 	ynh_restore_upgradebackup
-}
-# Exit if an error occurs during the execution of the script
-#REMOVEME? ynh_abort_if_errors
-
 #=================================================
 # STANDARD UPGRADE STEPS
 #=================================================
@@ -46,7 +22,7 @@ upgrade_type=$(ynh_check_app_version_changed)
 #=================================================
 ynh_script_progression --message="Ensuring downward compatibility..."
 
-ynh_app_setting_delete --app=$app --key=architecture
+ynh_app_setting_delete --app=$app --key=$YNH_ARCH
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
@@ -62,14 +38,6 @@ then
 	ynh_secure_remove --file="$tempdir"
 fi
 
-#=================================================
-# UPGRADE DEPENDENCIES
-#=================================================
-#REMOVEME? ynh_script_progression --message="Upgrading dependencies..."
-
-ynh_install_extra_repo --repo="https://download.docker.com/linux/debian $(lsb_release -cs) stable" --key="https://download.docker.com/linux/debian/gpg" --name="${app}-docker"
-#REMOVEME? ynh_install_app_dependencies $pkg_dependencies
-
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
 #=================================================
diff --git a/tests.toml b/tests.toml
new file mode 100644
index 0000000..d9ffdde
--- /dev/null
+++ b/tests.toml
@@ -0,0 +1,20 @@
+#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/tests.v1.schema.json
+
+test_format = 1.0
+
+[default]
+
+
+    # ------------
+    # Tests to run
+    # ------------
+
+    exclude = ["install.subdir", "change_url", "install.private", "install.multi"]
+
+    # -------------------------------
+    # Default args to use for install
+    # -------------------------------
+
+    args.gitlab_url="https://gitlab.com/"
+    args.token="GR1348941_Rew7obt4p9jZyQUtHLx"
+    args.docker_image="alpine:latest"
\ No newline at end of file

From d0038319e71e26aa5e7ed8f3afc8fecac8bcf56b Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Thu, 9 Nov 2023 12:45:20 +0000
Subject: [PATCH 03/20] Auto-update README

---
 README.md    | 16 +---------------
 README_fr.md | 17 +----------------
 2 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/README.md b/README.md
index b1cd8a5..dfb963e 100644
--- a/README.md
+++ b/README.md
@@ -25,26 +25,12 @@ GitLab Runner is a continuous integration tool to use with a GitLab instance (YN
 
 ![Screenshot of GitLab Runner](./doc/screenshots/ci-cd-test-deploy-illustration_2x.png)
 
-## Disclaimers / important information
-
-## Configuration
-
-How to configure this app: by the admin panel of GitLab or the settings "CI/CD" of your project.
-
-### System configuration
-
-Running a Gitlab Runner mandates to choose [an executor](https://docs.gitlab.com/runner/executors/) at registeration time (when the Gitlab Runner instance registers to a Gitlab instance). For now this YunoHost application only supports the `docker` executor.
-
-## 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.
-* If you get this message during a job: `Could not resolve host: you.domain.tld`, you can add `dns_search = [“you.domain.tld”]` in the section `[[runners]]` section.
-
 ## Documentation and resources
 
 * Official app website: <https://gitlab.com/gitlab-org/gitlab-runner>
 * Official admin documentation: <https://docs.gitlab.com/runner/>
 * Upstream app code repository: <https://gitlab.com/gitlab-org/gitlab-runner>
+* YunoHost Store: <https://apps.yunohost.org/app/gitlab-runner>
 * Report a bug: <https://github.com/YunoHost-Apps/gitlab-runner_ynh/issues>
 
 ## Developer info
diff --git a/README_fr.md b/README_fr.md
index eeaf3c9..0b0cbf0 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -25,27 +25,12 @@ GitLab Runner est un outil d'intégration continue à utiliser avec une instance
 
 ![Capture d’écran de GitLab Runner](./doc/screenshots/ci-cd-test-deploy-illustration_2x.png)
 
-## Avertissements / informations importantes
-
-## Configuration
-
-Comment configurer cette application: via le panneau d'administration de GitLab ou les paramettres "CI/CD" de votre projet.
-
-### Configuration système
-
-Lors du premier démarrage d'un Gitlab Runner, [un exécuteur](https://docs.gitlab.com/runner/executors/) doit être choisi (Lorsque l'instance Gitlab Runner s'enregistre auprès d'une instance Gitlab). Pour l'instant, cette application YunoHost ne supporte que l'[exécuteur `docker`](https://docs.gitlab.com/runner/executors/docker.html).
-
-## 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 
-ou la section admin de l'instance GitLab à relier à ce runner.
-* Si vous avez ce message pendant un travail : `Could not resolve host : you.domain.tld`, vous pouvez ajouter `dns_search = ["you.domain.tld"]` dans la section `[[runners]]`.
-
 ## Documentations et ressources
 
 * Site officiel de l’app : <https://gitlab.com/gitlab-org/gitlab-runner>
 * Documentation officielle de l’admin : <https://docs.gitlab.com/runner/>
 * Dépôt de code officiel de l’app : <https://gitlab.com/gitlab-org/gitlab-runner>
+* YunoHost Store: <https://apps.yunohost.org/app/gitlab-runner>
 * Signaler un bug : <https://github.com/YunoHost-Apps/gitlab-runner_ynh/issues>
 
 ## Informations pour les développeurs

From 0627d1a9000c53dce98e749b032d69f45ae5ea7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 17 Nov 2023 08:29:20 +0100
Subject: [PATCH 04/20] Update manifest.toml

---
 manifest.toml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index cc758c3..74d855f 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -19,8 +19,11 @@ code = "https://gitlab.com/gitlab-org/gitlab-runner"
 yunohost = ">= 11.2"
 architectures = ["amd64", "i386", "armhf", "arm64"]
 multi_instance = false
+
 ldap = "not_relevant"
+
 sso = "not_relevant"
+
 disk = "50M"
 ram.build = "50M"
 ram.runtime = "50M"
@@ -57,8 +60,6 @@ ram.runtime = "50M"
         arm64.sha256 = "9747f0f82ec099ce34b1b352a9b09fbe237ed710f22c273fe7c08b1a80494b33"
         amd64.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.5.0/downloads/packages/deb/gitlab-runner_amd64.deb"
         amd64.sha256 = "7b619273ef5b845407dd45a84c7a1e07442493f2d140c94720f6c47c3a403b48"
-        armel.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.5.0/downloads/packages/deb/gitlab-runner_armel.deb"
-        armel.sha256 = "8d78e75bf8b75b64d86aa5c05df47b0fc7941a7c953a2cf55a487d8c19ca1e10"
         armhf.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.5.0/downloads/packages/deb/gitlab-runner_armhf.deb"
         armhf.sha256 = "ff51a7962851c1447c20d4bacc5b3ef2eef038045f9849fde089b4225e67d1ba"
         i386.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.5.0/downloads/packages/deb/gitlab-runner_i386.deb"
@@ -71,6 +72,7 @@ ram.runtime = "50M"
 
     [resources.permissions]
     main.url = "/"
+    main.allowed = "visitors"
     
     [resources.apt]
     packages = "ca-certificates, git, curl, tar"

From 125c05be6c453df1104ac83ca2707d86c37f10cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 17 Nov 2023 08:29:35 +0100
Subject: [PATCH 05/20] Update manifest.toml

---
 manifest.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/manifest.toml b/manifest.toml
index 74d855f..6400d82 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -54,7 +54,6 @@ ram.runtime = "50M"
 
 [resources]
         [resources.sources.main]
-        format = "deb"
         rename = "gitlab-runner.deb"
         arm64.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.5.0/downloads/packages/deb/gitlab-runner_aarch64.deb"
         arm64.sha256 = "9747f0f82ec099ce34b1b352a9b09fbe237ed710f22c273fe7c08b1a80494b33"

From b1a32fa01b19bc2b4d8fb420bc80b0096ee68b2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 17 Nov 2023 08:32:11 +0100
Subject: [PATCH 06/20] Update install

---
 scripts/install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index 4b912fa..0509fb9 100755
--- a/scripts/install
+++ b/scripts/install
@@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers
 #=================================================
 # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
 #=================================================
-#REMOVEME? ynh_script_progression --message="Validating installation parameters..."
+ynh_script_progression --message="Validating installation parameters..."
 
 config_path=/etc/$app
 test ! -e "$config_path" || ynh_die "This path already contains a folder"
@@ -48,7 +48,7 @@ ynh_app_setting_set --app=$app --key=executor --value=$executor
 ynh_script_progression --message="Setting up source files..."
 
 tempdir="$(mktemp -d)"
-ynh_setup_source --dest_dir=$tempdir --source_id=$YNH_ARCH
+ynh_setup_source --dest_dir=$tempdir
 dpkg -i $tempdir/gitlab-runner.deb
 ynh_secure_remove --file="$tempdir"
 

From 639779e45b8bfb7e0bd426bf8c250f2c5101f612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 17 Nov 2023 08:35:27 +0100
Subject: [PATCH 07/20] Update manifest.toml

---
 manifest.toml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 6400d82..dc0d716 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -2,10 +2,10 @@ packaging_format = 2
 
 id = "gitlab-runner"
 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)."
+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.5.0~ynh1"
+version = "16.6.0~ynh1"
 
 maintainers = ["kay0u"]
 
@@ -55,14 +55,14 @@ ram.runtime = "50M"
 [resources]
         [resources.sources.main]
         rename = "gitlab-runner.deb"
-        arm64.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.5.0/downloads/packages/deb/gitlab-runner_aarch64.deb"
-        arm64.sha256 = "9747f0f82ec099ce34b1b352a9b09fbe237ed710f22c273fe7c08b1a80494b33"
-        amd64.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.5.0/downloads/packages/deb/gitlab-runner_amd64.deb"
-        amd64.sha256 = "7b619273ef5b845407dd45a84c7a1e07442493f2d140c94720f6c47c3a403b48"
-        armhf.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.5.0/downloads/packages/deb/gitlab-runner_armhf.deb"
-        armhf.sha256 = "ff51a7962851c1447c20d4bacc5b3ef2eef038045f9849fde089b4225e67d1ba"
-        i386.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.5.0/downloads/packages/deb/gitlab-runner_i386.deb"
-        i386.sha256 = "271b0437223eba292a79b4c427bdbca3c5edd578292149526b2bec5eb27d8c57"
+        arm64.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.6.0/downloads/packages/deb/gitlab-runner_arm64.deb"
+        arm64.sha256 = "4cad21c231e4d52ad4d31287211bd63bc10238081de82a01afa174d3949b2859"
+        amd64.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.6.0/downloads/packages/deb/gitlab-runner_amd64.deb"
+        amd64.sha256 = "b052147d1ded0cba4a75a8beecd2592f6c940b1b7036ff0ffb463e3114f16e9b"
+        armhf.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.6.0/downloads/packages/deb/gitlab-runner_armhf.deb"
+        armhf.sha256 = "efa6024bece3c353382898350c5ac77e1f51c7261d056fbde13785aee4aa6527"
+        i386.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.6.0/downloads/packages/deb/gitlab-runner_i386.deb"
+        i386.sha256 = "476eb1a58f92a9f8badd15f514821b5b17c2420b2129650fa8ce1158dcdff815"
 
 
     [resources.system_user]

From df6fb5b6d86e9b981dce39389d26103e23405bea Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Fri, 17 Nov 2023 07:35:31 +0000
Subject: [PATCH 08/20] Auto-update README

---
 README.md    | 2 +-
 README_fr.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index dfb963e..5ce07fe 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,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.5.0~ynh1
+**Shipped version:** 16.6.0~ynh1
 
 ## Screenshots
 
diff --git a/README_fr.md b/README_fr.md
index 0b0cbf0..0bcad7a 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 GitLab Runner est un outil d'intégration continue à utiliser avec une instance GitLab (YNH ou non).
 
 
-**Version incluse :** 16.5.0~ynh1
+**Version incluse :** 16.6.0~ynh1
 
 ## Captures d’écran
 

From 3944cc87d6f1de5004a015582fbb7d77c58d3c1d Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 25 Nov 2023 08:12:53 +0100
Subject: [PATCH 09/20] Update tests.toml

---
 tests.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests.toml b/tests.toml
index d9ffdde..54a06e2 100644
--- a/tests.toml
+++ b/tests.toml
@@ -15,6 +15,6 @@ test_format = 1.0
     # Default args to use for install
     # -------------------------------
 
-    args.gitlab_url="https://gitlab.com/"
-    args.token="GR1348941_Rew7obt4p9jZyQUtHLx"
-    args.docker_image="alpine:latest"
\ No newline at end of file
+    args.gitlab_url = "https://gitlab.com/"
+    args.token = "GR1348941_Rew7obt4p9jZyQUtHLx"
+    args.docker_image = "alpine:latest"
\ No newline at end of file

From 9a2b32b928de9db6e1bf749d3ba9b0cfef80fdcd Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 25 Nov 2023 08:13:01 +0100
Subject: [PATCH 10/20] Update install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 0509fb9..f080cb7 100755
--- a/scripts/install
+++ b/scripts/install
@@ -57,7 +57,7 @@ ynh_secure_remove --file="$tempdir"
 #=================================================
 # SETUP GITLAB RUNNER
 #=================================================
-ynh_script_progression --message="Configuring Gitlab Runner..."
+ynh_script_progression --message="Configuring GitLab Runner..."
 
 # Can be registered several time, to do this give a list of gitlab_url, token and docker_image separated by a comma.
 split_char=","

From c82b46bbfbb9f388ece97e542ad285bbc6114dff Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 25 Nov 2023 08:15:05 +0100
Subject: [PATCH 11/20] Update manifest.toml

---
 manifest.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index dc0d716..2f375ad 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -69,9 +69,9 @@ ram.runtime = "50M"
 
     [resources.install_dir]
 
-    [resources.permissions]
-    main.url = "/"
-    main.allowed = "visitors"
+    #[resources.permissions]
+    #main.url = "/"
+    #main.allowed = "visitors"
     
     [resources.apt]
     packages = "ca-certificates, git, curl, tar"

From 1a6ddf42539ffb9135a291be2d2a0b67dcc597f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 22 Dec 2023 14:13:18 +0100
Subject: [PATCH 12/20] Update remove

---
 scripts/remove | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/remove b/scripts/remove
index 7d569af..55359ed 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -41,7 +41,7 @@ dpkg --remove $app
 #=================================================
 ynh_script_progression --message="Removing various files..."
 
-ynh_secure_remove --file="$config_path"
+ynh_secure_remove --file="/etc/$app"
 
 #=================================================
 # END OF SCRIPT

From 95acce6695317c85f6685df0cf9c2343b92f3ef9 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Fri, 22 Dec 2023 13:15:18 +0000
Subject: [PATCH 13/20] Auto-update README

---
 README.md    | 3 +--
 README_fr.md | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 3ab0923..5ce07fe 100644
--- a/README.md
+++ b/README.md
@@ -19,8 +19,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.6.1~ynh1
-
+**Shipped version:** 16.6.0~ynh1
 
 ## Screenshots
 
diff --git a/README_fr.md b/README_fr.md
index 4c789a5..0bcad7a 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -19,8 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 GitLab Runner est un outil d'intégration continue à utiliser avec une instance GitLab (YNH ou non).
 
 
-**Version incluse :** 16.6.1~ynh1
-
+**Version incluse :** 16.6.0~ynh1
 
 ## Captures d’écran
 

From 7063fb1700850209364983bd56d7038d793f674b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 22 Dec 2023 15:55:37 +0100
Subject: [PATCH 14/20] fix

---
 scripts/install |  5 ++---
 scripts/remove  | 15 ---------------
 scripts/restore |  6 +++---
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/scripts/install b/scripts/install
index f080cb7..3bd7854 100755
--- a/scripts/install
+++ b/scripts/install
@@ -14,8 +14,7 @@ source /usr/share/yunohost/helpers
 #=================================================
 ynh_script_progression --message="Validating installation parameters..."
 
-config_path=/etc/$app
-test ! -e "$config_path" || ynh_die "This path already contains a folder"
+test ! -e "/etc/$app" || ynh_die "This path already contains a folder"
 
 # By default, the runner will use docker to run your builds. PR are welcomes to implement more executors
 executor="docker"
@@ -88,7 +87,7 @@ done
 #=================================================
 
 # Calculate and store the config file checksum into the app settings
-ynh_store_file_checksum "$config_path/config.toml"
+ynh_store_file_checksum "/etc/$app/config.toml"
 
 #=================================================
 # GENERIC FINALIZATION
diff --git a/scripts/remove b/scripts/remove
index 55359ed..487106b 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -22,25 +22,10 @@ then
 	yunohost service remove $app
 fi
 
-#=================================================
-# UNREGISTER ALL RUNNERS
-#=================================================
-ynh_script_progression --message="Unregistering all runners..."
-
 ynh_exec_warn_less $app unregister --all-runners
 
-#=================================================
-# REMOVE GITLAB RUNNER
-#=================================================
-ynh_script_progression --message="Removing Gitlab Runner"
-
 dpkg --remove $app
 
-#=================================================
-# REMOVE VARIOUS FILES
-#=================================================
-ynh_script_progression --message="Removing various files..."
-
 ynh_secure_remove --file="/etc/$app"
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index f213ace..29afe53 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -15,8 +15,8 @@ source /usr/share/yunohost/helpers
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..."
 
-test ! -d $config_path \
-	|| ynh_die --message="There is already a directory: $config_path "
+test ! -d /etc/$app \
+	|| ynh_die --message="There is already a directory: /etc/$app "
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
@@ -64,7 +64,7 @@ done
 #=================================================
 
 # Calculate and store the config file checksum into the app settings
-ynh_store_file_checksum "$config_path/config.toml"
+ynh_store_file_checksum "/etc/$app/config.toml"
 
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST

From 1b36c52598b4aa2588f6dde187994eaa299b3aec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 22 Dec 2023 17:06:19 +0100
Subject: [PATCH 15/20] Update _common.sh

---
 scripts/_common.sh | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 1384d7f..787b4d4 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -12,13 +12,6 @@
 #=================================================
 
 # Restore a previous backup if the action process failed
-#
-# usage:
-# ynh_backup_before_action
-#REMOVEME? # ynh_clean_setup () {
-# 	ynh_restore_actionbackup
-# }
-#REMOVEME? # ynh_abort_if_errors
 ynh_restore_actionbackup () {
 	echo "Action failed." >&2
 	local app_bck=${app//_/-}	# Replace all '_' by '-'
@@ -42,13 +35,6 @@ ynh_restore_actionbackup () {
 }
 
 # Make a backup in case of failed action
-#
-# usage:
-# ynh_backup_before_action
-#REMOVEME? # ynh_clean_setup () {
-# 	ynh_restore_actionbackup
-# }
-#REMOVEME? # ynh_abort_if_errors
 ynh_backup_before_action () {
 	if [ ! -e "/etc/yunohost/apps/$app/scripts/backup" ]
 	then

From 4e427270402a35788c0d9aac16af8d55c0ee4cba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 22 Dec 2023 17:07:15 +0100
Subject: [PATCH 16/20] Update register

---
 scripts/actions/register | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/actions/register b/scripts/actions/register
index 31360f1..82dff31 100644
--- a/scripts/actions/register
+++ b/scripts/actions/register
@@ -68,7 +68,7 @@ ynh_abort_if_errors
 #=================================================
 # REGISTER THE RUNNER
 #=================================================
-ynh_script_progression --message="Register Gitlab Runner..."
+ynh_script_progression --message="Register GitLab Runner..."
 
 # Can be registered several time, to do this give a list of gitlab_url, token and docker_image separated by a comma.
 split_char=","

From eb8cb139975b4fa89c663628328b23e44884fc33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 22 Dec 2023 17:11:42 +0100
Subject: [PATCH 17/20] Update restore

---
 scripts/restore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/restore b/scripts/restore
index 29afe53..1329b4e 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -24,7 +24,7 @@ test ! -d /etc/$app \
 ynh_script_progression --message="Reinstalling GitLab Runner..."
 
 tempdir="$(mktemp -d)"
-ynh_setup_source --dest_dir=$tempdir --source_id=$YNH_ARCH
+ynh_setup_source --dest_dir=$tempdir
 dpkg -i $tempdir/gitlab-runner.deb
 ynh_secure_remove --file="$tempdir"
 

From 4e3426e9aab64afdf0ca9f5d513683e4ec6004a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 22 Dec 2023 17:12:26 +0100
Subject: [PATCH 18/20] Update upgrade

---
 scripts/upgrade | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 934a9b1..9cb9f94 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -20,7 +20,7 @@ upgrade_type=$(ynh_check_app_version_changed)
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
 #=================================================
-ynh_script_progression --message="Ensuring downward compatibility..."
+ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
 
 ynh_app_setting_delete --app=$app --key=$YNH_ARCH
 
@@ -30,10 +30,10 @@ ynh_app_setting_delete --app=$app --key=$YNH_ARCH
 
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
-	ynh_script_progression --message="Upgrading source files..."
+	ynh_script_progression --message="Upgrading source files..." --weight=1
 
 	tempdir="$(mktemp -d)"
-	ynh_setup_source --dest_dir=$tempdir --source_id=$YNH_ARCH
+	ynh_setup_source --dest_dir=$tempdir
 	dpkg -i $tempdir/gitlab-runner.deb
 	ynh_secure_remove --file="$tempdir"
 fi
@@ -41,7 +41,7 @@ fi
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
 #=================================================
-ynh_script_progression --message="Integrating service in YunoHost..."
+ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
 yunohost service add $app
 

From 24b7b647d499cf1937e93126cf8cf91bc328e58f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 22 Dec 2023 17:23:55 +0100
Subject: [PATCH 19/20] Update manifest.toml

---
 manifest.toml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 2f375ad..38b6a59 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -68,10 +68,6 @@ ram.runtime = "50M"
     [resources.system_user]
 
     [resources.install_dir]
-
-    #[resources.permissions]
-    #main.url = "/"
-    #main.allowed = "visitors"
     
     [resources.apt]
     packages = "ca-certificates, git, curl, tar"

From dbf869b6bbde1ed07f6b964d92040e7f3d842b0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@piedallu.me>
Date: Fri, 26 Jan 2024 22:55:38 +0100
Subject: [PATCH 20/20] Add manifest schema, enable autoupdaet

---
 manifest.toml | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 38b6a59..25faf03 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -1,3 +1,5 @@
+#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/manifest.v2.schema.json
+
 packaging_format = 2
 
 id = "gitlab-runner"
@@ -53,24 +55,35 @@ ram.runtime = "50M"
     default = "alpine:latest"
 
 [resources]
-        [resources.sources.main]
-        rename = "gitlab-runner.deb"
-        arm64.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.6.0/downloads/packages/deb/gitlab-runner_arm64.deb"
-        arm64.sha256 = "4cad21c231e4d52ad4d31287211bd63bc10238081de82a01afa174d3949b2859"
-        amd64.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.6.0/downloads/packages/deb/gitlab-runner_amd64.deb"
-        amd64.sha256 = "b052147d1ded0cba4a75a8beecd2592f6c940b1b7036ff0ffb463e3114f16e9b"
-        armhf.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.6.0/downloads/packages/deb/gitlab-runner_armhf.deb"
-        armhf.sha256 = "efa6024bece3c353382898350c5ac77e1f51c7261d056fbde13785aee4aa6527"
-        i386.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.6.0/downloads/packages/deb/gitlab-runner_i386.deb"
-        i386.sha256 = "476eb1a58f92a9f8badd15f514821b5b17c2420b2129650fa8ce1158dcdff815"
+    [resources.sources.main]
+    rename = "gitlab-runner.deb"
+    amd64.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.6.0/downloads/packages/deb/gitlab-runner_amd64.deb"
+    amd64.sha256 = "b052147d1ded0cba4a75a8beecd2592f6c940b1b7036ff0ffb463e3114f16e9b"
+    i386.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.6.0/downloads/packages/deb/gitlab-runner_i386.deb"
+    i386.sha256 = "476eb1a58f92a9f8badd15f514821b5b17c2420b2129650fa8ce1158dcdff815"
+    arm64.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.6.0/downloads/packages/deb/gitlab-runner_arm64.deb"
+    arm64.sha256 = "4cad21c231e4d52ad4d31287211bd63bc10238081de82a01afa174d3949b2859"
+    armhf.url = "https://gitlab.com/gitlab-org/gitlab-runner/-/releases/v16.6.0/downloads/packages/deb/gitlab-runner_armhf.deb"
+    armhf.sha256 = "efa6024bece3c353382898350c5ac77e1f51c7261d056fbde13785aee4aa6527"
 
+    autoupdate.upstream = "https://gitlab.com/gitlab-org/gitlab-runner"
+    autoupdate.strategy = "latest_gitlab_release"
+    autoupdate.asset.amd64 = "package: DEB amd64"
+    autoupdate.asset.i386 = "package: DEB i386"
+    autoupdate.asset.arm64 = "package: DEB arm64"
+    autoupdate.asset.armhf = "package: DEB armhf"
 
     [resources.system_user]
 
     [resources.install_dir]
-    
+
     [resources.apt]
-    packages = "ca-certificates, git, curl, tar"
+    packages = [
+        "ca-certificates",
+        "git",
+        "curl",
+        "tar",
+    ]
 
     extras.docker.repo = "https://download.docker.com/linux/debian bullseye stable"
     extras.docker.key = "https://download.docker.com/linux/debian/gpg"