From 2510dd53a857129ddd6e75b53fe6be9144e64620 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Tue, 14 Feb 2023 19:45:34 +0100 Subject: [PATCH 01/18] test woodpecker --- .gitea/workflows/image.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .gitea/workflows/image.yml diff --git a/.gitea/workflows/image.yml b/.gitea/workflows/image.yml new file mode 100644 index 0000000..f1085cd --- /dev/null +++ b/.gitea/workflows/image.yml @@ -0,0 +1,9 @@ +pipeline: + build: + image: debian + commands: + - echo "This is the build step" + a-test-step: + image: debian + commands: + - echo "Testing.." -- 2.45.2 From 9591c43e9ff9dbc256a3ebfd7dee30061e54769f Mon Sep 17 00:00:00 2001 From: Mylloon Date: Tue, 14 Feb 2023 19:47:54 +0100 Subject: [PATCH 02/18] move to woodpecker folder --- {.gitea/workflows => .woodpecker}/image.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {.gitea/workflows => .woodpecker}/image.yml (100%) diff --git a/.gitea/workflows/image.yml b/.woodpecker/image.yml similarity index 100% rename from .gitea/workflows/image.yml rename to .woodpecker/image.yml -- 2.45.2 From 5c221d265deec761344744a0e5122bab4b1ce5b9 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Tue, 14 Feb 2023 19:50:07 +0100 Subject: [PATCH 03/18] change again --- {.woodpecker => .gitea/workflows}/image.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {.woodpecker => .gitea/workflows}/image.yml (100%) diff --git a/.woodpecker/image.yml b/.gitea/workflows/image.yml similarity index 100% rename from .woodpecker/image.yml rename to .gitea/workflows/image.yml -- 2.45.2 From 872e9081a862da755261b5453353f54dd5c71a0a Mon Sep 17 00:00:00 2001 From: Mylloon Date: Tue, 14 Feb 2023 20:10:18 +0100 Subject: [PATCH 04/18] add docker ?? --- .gitea/workflows/image.yml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/image.yml b/.gitea/workflows/image.yml index f1085cd..895d611 100644 --- a/.gitea/workflows/image.yml +++ b/.gitea/workflows/image.yml @@ -1,9 +1,15 @@ pipeline: build: - image: debian - commands: - - echo "This is the build step" - a-test-step: - image: debian - commands: - - echo "Testing.." + image: woodpeckerci/plugin-docker-buildx + pull: true + when: + branch: main + event: [push] + settings: + platforms: linux/amd64 + registry: https://git.mylloon.fr + username: ${CI_REPO_OWNER} + password: + from_secret: woodpecker_botanique + repo: git.mylloon.fr/${CI_REPO,,} + tag: "latest" -- 2.45.2 From 6642f00c2b4bb5136765b616b982c591a21c825f Mon Sep 17 00:00:00 2001 From: Mylloon Date: Tue, 14 Feb 2023 20:12:26 +0100 Subject: [PATCH 05/18] remove pull --- .gitea/workflows/image.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/image.yml b/.gitea/workflows/image.yml index 895d611..ecef9d2 100644 --- a/.gitea/workflows/image.yml +++ b/.gitea/workflows/image.yml @@ -1,7 +1,6 @@ pipeline: build: image: woodpeckerci/plugin-docker-buildx - pull: true when: branch: main event: [push] -- 2.45.2 From 90d65e56a95abccdb0152d622d479c125c4db6a8 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Tue, 14 Feb 2023 20:13:35 +0100 Subject: [PATCH 06/18] hardcode password --- .gitea/workflows/image.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/image.yml b/.gitea/workflows/image.yml index ecef9d2..bb9889b 100644 --- a/.gitea/workflows/image.yml +++ b/.gitea/workflows/image.yml @@ -8,7 +8,7 @@ pipeline: platforms: linux/amd64 registry: https://git.mylloon.fr username: ${CI_REPO_OWNER} - password: - from_secret: woodpecker_botanique + password: abc123 + insecure: true repo: git.mylloon.fr/${CI_REPO,,} tag: "latest" -- 2.45.2 From 43ea0ff94599d4dad1249daaf1be0f8562815d11 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Tue, 14 Feb 2023 20:18:43 +0100 Subject: [PATCH 07/18] refactor --- .gitea/workflows/image.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/image.yml b/.gitea/workflows/image.yml index bb9889b..7d9c70e 100644 --- a/.gitea/workflows/image.yml +++ b/.gitea/workflows/image.yml @@ -1,14 +1,18 @@ pipeline: - build: + - name: Build Botanique image image: woodpeckerci/plugin-docker-buildx - when: - branch: main - event: [push] settings: + registry: git.mylloon.fr + repo: git.mylloon.fr/${CI_REPO,,} platforms: linux/amd64 - registry: https://git.mylloon.fr - username: ${CI_REPO_OWNER} + tag: latest + username: Anri password: abc123 insecure: true - repo: git.mylloon.fr/${CI_REPO,,} - tag: "latest" + # username: + # from_secret: docker_username + # password: + # from_secret: docker_password + when: + - event: push + branch: main -- 2.45.2 From a7c47aa160c75e9f9657e85cb7acb3f6eba20361 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Tue, 14 Feb 2023 20:20:34 +0100 Subject: [PATCH 08/18] add group --- .gitea/workflows/image.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/image.yml b/.gitea/workflows/image.yml index 7d9c70e..3cf88cf 100644 --- a/.gitea/workflows/image.yml +++ b/.gitea/workflows/image.yml @@ -1,6 +1,7 @@ pipeline: - name: Build Botanique image image: woodpeckerci/plugin-docker-buildx + group: docker settings: registry: git.mylloon.fr repo: git.mylloon.fr/${CI_REPO,,} -- 2.45.2 From 4cdef1444f75dc6c787353e8900e07434e6b87e1 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Tue, 14 Feb 2023 20:24:34 +0100 Subject: [PATCH 09/18] update --- .gitea/workflows/image.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/image.yml b/.gitea/workflows/image.yml index 3cf88cf..2a3521a 100644 --- a/.gitea/workflows/image.yml +++ b/.gitea/workflows/image.yml @@ -1,19 +1,17 @@ pipeline: - - name: Build Botanique image + docker: + name: Build Botanique image image: woodpeckerci/plugin-docker-buildx group: docker settings: registry: git.mylloon.fr repo: git.mylloon.fr/${CI_REPO,,} platforms: linux/amd64 - tag: latest - username: Anri - password: abc123 - insecure: true - # username: - # from_secret: docker_username - # password: - # from_secret: docker_password + tags: latest + username: + from_secret: docker_username + password: + from_secret: docker_password when: - event: push branch: main -- 2.45.2 From fbba0e7b4d6429ff075a89797eb274dccf34b7b0 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Tue, 14 Feb 2023 20:24:57 +0100 Subject: [PATCH 10/18] build pls --- .gitea/workflows/image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/image.yml b/.gitea/workflows/image.yml index 2a3521a..7739a5c 100644 --- a/.gitea/workflows/image.yml +++ b/.gitea/workflows/image.yml @@ -1,5 +1,5 @@ pipeline: - docker: + build: name: Build Botanique image image: woodpeckerci/plugin-docker-buildx group: docker -- 2.45.2 From c57376f41b2199eec6a9ddc3bd4dfefeaf64f6f0 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Tue, 14 Feb 2023 20:29:09 +0100 Subject: [PATCH 11/18] another try --- .gitea/workflows/image.yml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/.gitea/workflows/image.yml b/.gitea/workflows/image.yml index 7739a5c..d4ce17f 100644 --- a/.gitea/workflows/image.yml +++ b/.gitea/workflows/image.yml @@ -1,17 +1,12 @@ pipeline: - build: - name: Build Botanique image + publish: image: woodpeckerci/plugin-docker-buildx - group: docker settings: - registry: git.mylloon.fr - repo: git.mylloon.fr/${CI_REPO,,} platforms: linux/amd64 + repo: git.mylloon.fr/${CI_REPO,,} + registry: git.mylloon.fr + dry_run: true tags: latest - username: - from_secret: docker_username + username: ${CI_REPO_OWNER} password: - from_secret: docker_password - when: - - event: push - branch: main + from_secret: cb_token -- 2.45.2 From 239b0135a081c7e46bbaa5f91f2aa0604fbd3fd3 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Tue, 14 Feb 2023 20:37:41 +0100 Subject: [PATCH 12/18] autotag and when --- .gitea/workflows/image.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/image.yml b/.gitea/workflows/image.yml index d4ce17f..910880b 100644 --- a/.gitea/workflows/image.yml +++ b/.gitea/workflows/image.yml @@ -4,9 +4,11 @@ pipeline: settings: platforms: linux/amd64 repo: git.mylloon.fr/${CI_REPO,,} + auto_tag: true registry: git.mylloon.fr - dry_run: true - tags: latest username: ${CI_REPO_OWNER} password: from_secret: cb_token + when: + event: push + branch: main -- 2.45.2 From 07ab8e1dfd5d08aa6ad493c7d5c11b89e8172393 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Tue, 14 Feb 2023 20:41:39 +0100 Subject: [PATCH 13/18] use latest --- .gitea/workflows/image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/image.yml b/.gitea/workflows/image.yml index 910880b..a612c74 100644 --- a/.gitea/workflows/image.yml +++ b/.gitea/workflows/image.yml @@ -1,6 +1,6 @@ pipeline: publish: - image: woodpeckerci/plugin-docker-buildx + image: woodpeckerci/plugin-docker-buildx:latest settings: platforms: linux/amd64 repo: git.mylloon.fr/${CI_REPO,,} -- 2.45.2 From 2161e60b2a6c6e79b56b6f82529724ee7fb83434 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Tue, 14 Feb 2023 20:42:43 +0100 Subject: [PATCH 14/18] ??? --- .gitea/workflows/image.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/image.yml b/.gitea/workflows/image.yml index a612c74..b3d5d2f 100644 --- a/.gitea/workflows/image.yml +++ b/.gitea/workflows/image.yml @@ -9,6 +9,6 @@ pipeline: username: ${CI_REPO_OWNER} password: from_secret: cb_token - when: - event: push - branch: main + when: + event: push + branch: main -- 2.45.2 From 7dbc8a1367afd1b88215f36e18898977616c8660 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Tue, 14 Feb 2023 20:58:18 +0100 Subject: [PATCH 15/18] use v2 only [CI SKIP] --- .gitea/workflows/image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/image.yml b/.gitea/workflows/image.yml index b3d5d2f..286dea2 100644 --- a/.gitea/workflows/image.yml +++ b/.gitea/workflows/image.yml @@ -1,6 +1,6 @@ pipeline: publish: - image: woodpeckerci/plugin-docker-buildx:latest + image: woodpeckerci/plugin-docker-buildx:2 settings: platforms: linux/amd64 repo: git.mylloon.fr/${CI_REPO,,} -- 2.45.2 From afdf131a35d2896b6f99c405ea4c1f89701d47ce Mon Sep 17 00:00:00 2001 From: Mylloon Date: Tue, 14 Feb 2023 21:01:03 +0100 Subject: [PATCH 16/18] add ci badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index efa828a..21ca991 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 🌱 Botanique +# 🌱 Botanique [![status-badge](https://ci.mylloon.fr/api/badges/ConfrerieDuKassoulait/Botanique/status.svg)](https://ci.mylloon.fr/ConfrerieDuKassoulait/Botanique) [**Ajoute le bot à ton serveur**](https://discord.com/api/oauth2/authorize?client_id=965598852407230494&permissions=8&scope=bot%20applications.commands) -- 2.45.2 From 28dc603194281eae5a7161bbde19b70013767b18 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Tue, 14 Feb 2023 21:12:53 +0100 Subject: [PATCH 17/18] [skip ci] typo, update readme --- README.md | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 21ca991..73a66c7 100644 --- a/README.md +++ b/README.md @@ -6,31 +6,32 @@ ### En local -> Cloner le repo. +> Cloner le repo -> Spécifier un fichier `.env` en suivant [l'exemple](config/example.env). +> Spécifier un fichier `.env` en suivant [l'exemple](config/example.env) -> Installer les dépendences du bot. +> Installer les dépendances du bot ```bash npm install --legacy-peer-deps ``` -> Lancer le bot. +> Lancer le bot ```bash npm run main ``` -### Avec Docker (Recommandé) +### Avec Docker (recommandé) > Facile avec `docker-compose` ```docker version: "3.9" + services: botanique: - build: https://git.kennel.ml/ConfrerieDuKassoulait/Botanique.git#main + image: git.mylloon.fr/confreriedukassoulait/botanique:latest container_name: Botanique environment: - TOKEN_DISCORD=ton-token-va-ici @@ -41,10 +42,10 @@ services: ## Variables d'environnements -| Nom | Description | Par défaut | Commentaire | -| :-----------: | :---------------: | :--------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| Nom | Description | Par défaut | Commentaire | +| :-----------: | :---------------: | :--------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | | TOKEN_DISCORD | Token Discord | Aucune | -| DEFAULT_LANG | Langue par défaut | `fr` | Expérimental, si la langue par défaut n'est pas complète (càd 100%), le bot pourrait ne pas fonctionner correctement.
Liste des traductions disponibles [ici](./src/locales/). | +| DEFAULT_LANG | Langue par défaut | `fr` | Expérimental, si la langue par défaut n'est pas complète (càd 100%), le bot pourrait ne pas fonctionner correctement.
Liste des traductions disponibles [ici](./src/locales/) | ## Volumes @@ -62,6 +63,6 @@ Pour commencer, lis le [fichier de contribution](./CONTRIBUTING.md). Voir le [fichier LICENCE](./LICENCE). -# Références +# Crédits [Photo de profil](https://picrew.me/image_maker/1497656) -- 2.45.2 From d2a6377ccf11e6b0063a697b2bf553e0cc66e599 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Tue, 14 Feb 2023 21:13:04 +0100 Subject: [PATCH 18/18] [skip ci] change workflow name --- .gitea/workflows/{image.yml => publish.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .gitea/workflows/{image.yml => publish.yml} (100%) diff --git a/.gitea/workflows/image.yml b/.gitea/workflows/publish.yml similarity index 100% rename from .gitea/workflows/image.yml rename to .gitea/workflows/publish.yml -- 2.45.2