From 3373fda87575831e053caf771b576c2494b973e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 20 Jul 2020 15:08:39 +0200 Subject: [PATCH 1/3] Update manifest.json - *Some typos* --- manifest.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/manifest.json b/manifest.json index c6f0605..9de0485 100644 --- a/manifest.json +++ b/manifest.json @@ -29,8 +29,8 @@ "fr": "Veuillez entrer l'URL du coordinateur gitlab-ci" }, "help": { - "en": "This url can be retrived 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 or: Admin Area->Overview->Runners" + "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/" }, @@ -38,12 +38,12 @@ "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" + "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 retrived 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 or: Admin Area->Overview->Runners" + "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" }, From 6b993da424bc7dca261cb1b9ef6a7c2723c36f89 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 9 Sep 2020 11:09:15 +0200 Subject: [PATCH 2/3] 13.2.3 --- README.md | 2 +- README_fr.md | 2 +- conf/arm.src.default | 2 +- conf/i386.src.default | 2 +- conf/x86-64.src.default | 2 +- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 8 ++++---- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 9c25711..3e6cfc8 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.1.0 +**Shipped version:** 13.2.3 ## Screenshots diff --git a/README_fr.md b/README_fr.md index c0dd10e..78539f9 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.1.0 +**Version incluse:** 13.2.3 ## Captures d'écran diff --git a/conf/arm.src.default b/conf/arm.src.default index d602c81..823c11a 100644 --- a/conf/arm.src.default +++ b/conf/arm.src.default @@ -1,4 +1,4 @@ -SOURCE_URL=https://packages.gitlab.com/runner/gitlab-runner/packages/debian/stretch/gitlab-runner___VERSION___armhf.deb/download.deb +SOURCE_URL=https://packages.gitlab.com/runner/gitlab-runner/packages/debian/buster/gitlab-runner___VERSION___armhf.deb/download.deb SOURCE_SUM=__SHA256_SUM__ SOURCE_SUM_PRG=sha256sum SOURCE_FILENAME=__SOURCE_FILENAME__ diff --git a/conf/i386.src.default b/conf/i386.src.default index 337a046..450e7ec 100644 --- a/conf/i386.src.default +++ b/conf/i386.src.default @@ -1,4 +1,4 @@ -SOURCE_URL=https://packages.gitlab.com/runner/gitlab-runner/packages/debian/stretch/gitlab-runner___VERSION___i386.deb/download.deb +SOURCE_URL=https://packages.gitlab.com/runner/gitlab-runner/packages/debian/buster/gitlab-runner___VERSION___i386.deb/download.deb SOURCE_SUM=__SHA256_SUM__ SOURCE_SUM_PRG=sha256sum SOURCE_FILENAME=__SOURCE_FILENAME__ diff --git a/conf/x86-64.src.default b/conf/x86-64.src.default index 45fd82a..8eaa481 100644 --- a/conf/x86-64.src.default +++ b/conf/x86-64.src.default @@ -1,4 +1,4 @@ -SOURCE_URL=https://packages.gitlab.com/runner/gitlab-runner/packages/debian/stretch/gitlab-runner___VERSION___amd64.deb/download.deb +SOURCE_URL=https://packages.gitlab.com/runner/gitlab-runner/packages/debian/buster/gitlab-runner___VERSION___amd64.deb/download.deb SOURCE_SUM=__SHA256_SUM__ SOURCE_SUM_PRG=sha256sum SOURCE_FILENAME=__SOURCE_FILENAME__ diff --git a/manifest.json b/manifest.json index c6f0605..b64c7fb 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.1.0~ynh1", + "version": "13.2.3~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 fff7d0d..90056f0 100644 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,9 +1,9 @@ -gitlab_runner_version="13.1.0" +gitlab_runner_version="13.2.3" -gitlab_runner_x86_64_source_sha256="24a966617b2d26ce33c83f6d7f60b0b69c5d53bdd163818ff96a4020fa43b81a" +gitlab_runner_x86_64_source_sha256="8925157754117d85a72689de87cb2acbf657969210cf92991d883d242d7d3a07" -gitlab_runner_i386_source_sha256="f1f88804f731e41e7888f31ca56b739b1ec222a6648e139519626e48940b9a97" +gitlab_runner_i386_source_sha256="7f871ebfc25d72b4158e7aa6e0d583cc14c0d64d34a4c37e08e3dd7faa4785de" -gitlab_runner_arm_source_sha256="cceca3d53f328ae5e06df4018d652052c5433887579cc70702b83310b82f2245" +gitlab_runner_arm_source_sha256="f66089a342933c77351bfc87777b40c5f7410ed12a9db3b807f5802a6c5a0e85" gitlab_runner_filename="gitlab-runner-${gitlab_runner_version}.deb" From 7f4dcdb46b4ba15e2718770edb26d28221d405fb Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 9 Sep 2020 11:20:16 +0200 Subject: [PATCH 3/3] Add information, thanks jk_64 (forum) --- README.md | 1 + README_fr.md | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index 3e6cfc8..0b32812 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,7 @@ How to configure this app: by the admin panel of GitLab or the settings "CI/CD" ## 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. ## Links diff --git a/README_fr.md b/README_fr.md index 78539f9..6344989 100644 --- a/README_fr.md +++ b/README_fr.md @@ -36,6 +36,7 @@ Comment configurer cette application: via le panneau d'administration de GitLab * 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]]`. ## Links