From 55c6c6b0ade30e780e0094f143562b323bfe4182 Mon Sep 17 00:00:00 2001 From: Paul B Date: Thu, 11 Feb 2021 10:31:50 +0100 Subject: [PATCH 1/5] Explicit the executor used by the gitlab runner --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 0005258..e328dda 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,10 @@ GitLab Runner is a continuous integration tool to use with a GitLab instance (YN 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. + ## Documentation * Official documentation: https://docs.gitlab.com/runner/ From 94b357ecdf850647431b754aceb59a9335147b12 Mon Sep 17 00:00:00 2001 From: Paul B Date: Thu, 11 Feb 2021 10:35:27 +0100 Subject: [PATCH 2/5] =?UTF-8?q?Expliciter=20la=20configuration=20de=20l'ex?= =?UTF-8?q?=C3=A9cuteur?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README_fr.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README_fr.md b/README_fr.md index c40265b..5045f05 100644 --- a/README_fr.md +++ b/README_fr.md @@ -21,6 +21,10 @@ GitLab Runner est un outil d'intégration continue à utiliser avec une instance 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). + ## Documentation * Documentation officielle : https://docs.gitlab.com/runner/ From d43647feef26002c168666ad9fb67dc7549eb145 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Thu, 13 May 2021 17:47:15 +0200 Subject: [PATCH 3/5] [autopatch] Update issue and PR templates --- .github/ISSUE_TEMPLATE.md | 55 ++++++++++++++++++++++++++++++++ .github/PULL_REQUEST_TEMPLATE.md | 16 ++++++++++ 2 files changed, 71 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE.md create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 0000000..2729a6b --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,55 @@ +--- +name: Bug report +about: When creating a bug report, please use the following template to provide all the relevant information and help debugging efficiently. + +--- + +**How to post a meaningful bug report** +1. *Read this whole template first.* +2. *Determine if you are on the right place:* + - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* + - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.* + - *When in doubt, post here and we will figure it out together.* +3. *Delete the italic comments as you write over them below, and remove this guide.* +--- + +### Describe the bug + +*A clear and concise description of what the bug is.* + +### Context + +- Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...* +- YunoHost version: x.x.x +- I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...* +- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes* + - If yes, please explain: +- Using, or trying to install package version/branch: +- If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`* + +### Steps to reproduce + +- *If you performed a command from the CLI, the command itself is enough. For example:* + ```sh + sudo yunohost app install the_app + ``` +- *If you used the webadmin, please perform the equivalent command from the CLI first.* +- *If the error occurs in your browser, explain what you did:* + 1. *Go to '...'* + 2. *Click on '...'* + 3. *Scroll down to '...'* + 4. *See error* + +### Expected behavior + +*A clear and concise description of what you expected to happen. You can remove this section if the command above is enough to understand your intent.* + +### Logs + +*When an operation fails, YunoHost provides a simple way to share the logs.* +- *In the webadmin, the error message contains a link to the relevant log page. On that page, you will be able to 'Share with Yunopaste'. If you missed it, the logs of previous operations are also available under Tools > Logs.* +- *In command line, the command to share the logs is displayed at the end of the operation and looks like `yunohost log display [log name] --share`. If you missed it, you can find the log ID of a previous operation using `yunohost log list`.* + +*After sharing the log, please copypaste directly the link provided by YunoHost (to help readability, no need to copypaste the entire content of the log here, just the link is enough...)* + +*If applicable and useful, add screenshots to help explain your problem.* diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..ef70e18 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,16 @@ +## Problem + +- *Description of why you made this PR* + +## Solution + +- *And how do you fix that problem* + +## PR Status + +- [ ] Code finished and ready to be reviewed/tested +- [ ] The fix/enhancement were manually tested (if applicable) + +## Automatic tests + +Automatic tests can be triggered on https://ci-apps-dev.yunohost.org/ *after creating the PR*, by commenting "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!". (N.B. : for this to work you need to be a member of the Yunohost-Apps organization) From 96852d4d7e646117f359b46c40eb40070e3ae797 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Sun, 16 May 2021 21:27:33 +0200 Subject: [PATCH 4/5] fix paths --- manifest.json | 2 +- scripts/install | 14 +++++++------- scripts/restore | 15 +++++++-------- scripts/upgrade | 14 +++++++------- 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/manifest.json b/manifest.json index aa7e0a4..5d46125 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "pierre@kayou.io" }, "requirements": { - "yunohost": ">= 3.8.1" + "yunohost": ">= 4.2.3" }, "multi_instance": false, "services": [ diff --git a/scripts/install b/scripts/install index 523f82b..100b98c 100755 --- a/scripts/install +++ b/scripts/install @@ -102,17 +102,17 @@ ynh_install_app_dependencies $pkg_dependencies ynh_script_progression --message="Setting up source files..." update_src_version() { - source ./upgrade.d/upgrade.last.sh - cp ../conf/$architecture.src.default ../conf/$architecture.src - ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_runner_version" --target_file="../conf/$architecture.src" - ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_runner_filename" --target_file="../conf/$architecture.src" + source $YNH_APP_BASEDIR/scripts/upgrade.d/upgrade.last.sh + cp $YNH_APP_BASEDIR/conf/$architecture.src.default $YNH_APP_BASEDIR/conf/$architecture.src + ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_runner_version" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src" + ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_runner_filename" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src" if [ $architecture = "x86-64" ]; then - ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_x86_64_source_sha256" --target_file="../conf/$architecture.src" + ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_x86_64_source_sha256" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src" elif [ $architecture = "i386" ]; then - ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_i386_source_sha256" --target_file="../conf/$architecture.src" + ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_i386_source_sha256" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src" elif [ $architecture = "arm" ]; then - ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_arm_source_sha256" --target_file="../conf/$architecture.src" + ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_arm_source_sha256" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src" fi } diff --git a/scripts/restore b/scripts/restore index 431e707..4d21a24 100755 --- a/scripts/restore +++ b/scripts/restore @@ -65,18 +65,17 @@ ynh_install_app_dependencies $pkg_dependencies ynh_script_progression --message="Reinstalling GitLab Runner..." update_src_version() { - source ../settings/scripts/upgrade.d/upgrade.last.sh - mkdir -p ../conf/ - cp ../settings/conf/$architecture.src.default ../conf/$architecture.src - ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_runner_version" --target_file="../conf/$architecture.src" - ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_runner_filename" --target_file="../conf/$architecture.src" + source $YNH_APP_BASEDIR/scripts/upgrade.d/upgrade.last.sh + cp $YNH_APP_BASEDIR/conf/$architecture.src.default $YNH_APP_BASEDIR/conf/$architecture.src + ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_runner_version" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src" + ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_runner_filename" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src" if [ $architecture = "x86-64" ]; then - ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_x86_64_source_sha256" --target_file="../conf/$architecture.src" + ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_x86_64_source_sha256" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src" elif [ $architecture = "i386" ]; then - ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_i386_source_sha256" --target_file="../conf/$architecture.src" + ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_i386_source_sha256" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src" elif [ $architecture = "arm" ]; then - ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_arm_source_sha256" --target_file="../conf/$architecture.src" + ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_arm_source_sha256" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src" fi } diff --git a/scripts/upgrade b/scripts/upgrade index 160e5b6..4b83a54 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -47,17 +47,17 @@ ynh_abort_if_errors ynh_script_progression --message="Upgrading source files..." update_src_version() { - source ./upgrade.d/upgrade.last.sh - cp ../conf/$architecture.src.default ../conf/$architecture.src - ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_runner_version" --target_file="../conf/$architecture.src" - ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_runner_filename" --target_file="../conf/$architecture.src" + source $YNH_APP_BASEDIR/scripts/upgrade.d/upgrade.last.sh + cp $YNH_APP_BASEDIR/conf/$architecture.src.default $YNH_APP_BASEDIR/conf/$architecture.src + ynh_replace_string --match_string="__VERSION__" --replace_string="$gitlab_runner_version" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src" + ynh_replace_string --match_string="__SOURCE_FILENAME__" --replace_string="$gitlab_runner_filename" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src" if [ $architecture = "x86-64" ]; then - ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_x86_64_source_sha256" --target_file="../conf/$architecture.src" + ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_x86_64_source_sha256" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src" elif [ $architecture = "i386" ]; then - ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_i386_source_sha256" --target_file="../conf/$architecture.src" + ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_i386_source_sha256" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src" elif [ $architecture = "arm" ]; then - ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_arm_source_sha256" --target_file="../conf/$architecture.src" + ynh_replace_string --match_string="__SHA256_SUM__" --replace_string="$gitlab_runner_arm_source_sha256" --target_file="$YNH_APP_BASEDIR/conf/$architecture.src" fi } From 28795134126fa03494c3b789247e8556c58f8f2e Mon Sep 17 00:00:00 2001 From: Kay0u Date: Sun, 16 May 2021 21:34:12 +0200 Subject: [PATCH 5/5] 13.11.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 0005258..67fb492 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.7.0 +**Shipped version:** 13.11.0 ## Screenshots diff --git a/README_fr.md b/README_fr.md index c40265b..e42ae1a 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.7.0 +**Version incluse:** 13.11.0 ## Captures d'écran diff --git a/manifest.json b/manifest.json index 5d46125..2d7cbfe 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.7.0~ynh1", + "version": "13.11.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 5f15bb3..a970f93 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,9 +1,9 @@ -gitlab_runner_version="13.7.0" +gitlab_runner_version="13.11.0" -gitlab_runner_x86_64_source_sha256="708b26cd83eab0617ac8dc4d91cbbe0d2310a9a3c61cb8037623d08fff7001f6" +gitlab_runner_x86_64_source_sha256="449af4853475f34508252469117e9bf61ed91b671d271becf377d9ff4735e512" -gitlab_runner_i386_source_sha256="dd866c39ec10c2c7e0a2ebe1bca4e47211defd3072290a4420459cfde40d270c" +gitlab_runner_i386_source_sha256="928e1afd5b2f81576382e579e4b10296038e7f94d9d634bb0f35248af36a1571" -gitlab_runner_arm_source_sha256="9f2285916c8dd16c237852a72f03015db14115b7b809b71aad9d0fcac534fb72" +gitlab_runner_arm_source_sha256="e4917a217d4d2f67d7c3165c33a4ad3c5666dc67fa432d2d3ea08752878acfe8" gitlab_runner_filename="gitlab-runner-${gitlab_runner_version}.deb"