Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added auto-deploy #44

Merged
merged 6 commits into from
Aug 29, 2022
Merged

Added auto-deploy #44

merged 6 commits into from
Aug 29, 2022

Conversation

VForiel
Copy link
Contributor

@VForiel VForiel commented Aug 27, 2022

No description provided.

.github/workflows/deploy_gipsy-prod.yaml Outdated Show resolved Hide resolved
.github/workflows/deploy_gipsy-beta.yaml Outdated Show resolved Hide resolved
.github/workflows/deploy_gipsy-beta.yaml Outdated Show resolved Hide resolved
.github/workflows/deploy_gipsy-prod.yaml Outdated Show resolved Hide resolved
@Aeris1One
Copy link
Collaborator

Hé hé hé, je vois que mon format de commit se répands :)

@VForiel VForiel requested review from Aeris1One, ascpial, Theaustudio and ZRunner and removed request for Aeris1One August 28, 2022 11:09
@Aeris1One
Copy link
Collaborator

LGTM, je pense qu'il serait judicieux de tester d'abord l'Action uniquement sur bêta avant de l'activer aussi sur master.

@VForiel
Copy link
Contributor Author

VForiel commented Aug 28, 2022

Yep mais tu m'as dis que les actions ne marchent qu'une fois placées sur la branche master non ?
Ou alors tu veux que je retire l'action master de la PR ?

Copy link
Contributor

@ascpial ascpial left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ascpial
Copy link
Contributor

ascpial commented Aug 28, 2022

D'après Aeris one on peut dire que la branche beta est la branche principale et ça permet de tester l'action

@VForiel
Copy link
Contributor Author

VForiel commented Aug 28, 2022

Pas bête ! Il y a un intérêt à avoir master comme branche principale ou bien on peut laisser beta en tant que branche principale de façon permanente ?

@ascpial
Copy link
Contributor

ascpial commented Aug 28, 2022

La sécurité des branches ne s'applique pas à la branche principale ? Ou alors c'est au cas par cas ?

@Aeris1One
Copy link
Collaborator

À vrai dire je pensais commenter l'Action "deploy master" ici et merge sur master.

Mais maintenant qu'ascpial le dit on peut effectivement mettre la branche bêta en principale de façon permanente, ce qui permettrait de pouvoir mettre les Actions dessus, mais aussi la mettrais par défaut pour les nouvelles PR (je compte plus le nombre de fois où on m'as dit "change de branche t'as commit sur master" quand j'ouvrais des PR sur d'autres projets)

@ZRunner
Copy link
Contributor

ZRunner commented Aug 28, 2022

Pour la protection des branches, si on veut protéger main en gardant beta par défaut, la doc est ici : https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests. Il y a d’ailleurs un joli petit avertissement :

Protected branches are available in public repositories with GitHub Free and GitHub Free for organizations, and in public and private repositories with GitHub Pro, GitHub Team, GitHub Enterprise Cloud, and GitHub Enterprise Server

Mais je suis d’accord pour mettre bêta en défaut, c’est ce que j’ai fait pour Zbot d’ailleurs. Et en bonus, les stats de commits visible sur les profils des utilisateurs ne comptent que les branches par défaut donc ça motivera à commit :kappa:

@Aeris1One
Copy link
Collaborator

Ah ! C'est donc pour ça que j'ai 100 commits au total sur ma page de stats !
ouais nan peut-être pas la seule raison

@VForiel VForiel changed the base branch from master to beta August 28, 2022 14:43
@VForiel
Copy link
Contributor Author

VForiel commented Aug 28, 2022

Mais je suis d’accord pour mettre bêta en défaut, c’est ce que j’ai fait pour Zbot d’ailleurs. Et en bonus, les stats de commits visible sur les profils des utilisateurs ne comptent que les branches par défaut donc ça motivera à commit :kappa:

@ZRunner ça compte les commits fais dans des PR ? Ou bien c'est les commits direct sur la branche par défaut ? (auquel cas c'est nul pck même sur beta on fait des PR)

@ZRunner
Copy link
Contributor

ZRunner commented Aug 28, 2022

ça compte les commits fais dans des PR ? Ou bien c'est les commits direct sur la branche par défaut ? (auquel cas c'est nul pck même sur beta on fait des PR)
Bah, quand une PR est validée, à moins qu’elle soit squash tous tes commits sont ajoutés à l’historique de la branche, donc ça les compte correctement.

@VForiel
Copy link
Contributor Author

VForiel commented Aug 28, 2022

Bah, quand une PR est validée, à moins qu’elle soit squash tous tes commits sont ajoutés à l’historique de la branche, donc ça les compte correctement.

Mais du coup si on applique cette même logique, les PR faites sur beta ajoutent les commits à beta, puis le PR de beta à master ajoute ces mêmes commits à master du coup non ?

@ZRunner
Copy link
Contributor

ZRunner commented Aug 28, 2022

Mais du coup si on applique cette même logique, les PR faites sur beta ajoutent les commits à beta, puis le PR de beta à master ajoute ces mêmes commits à master du coup non ?

Je pensais qu'on squashait les PR sur master. Si c'est pas le cas alors oui, ça revient au même, au détail près que les contributions apparaîtront plus tard sur les profils (au moment de la release) (mais elles seront bien aux bonnes dates).

@VForiel VForiel merged commit 65cea64 into beta Aug 29, 2022
@Aeris1One Aeris1One deleted the auto-deploy branch August 30, 2022 14:10
@Aeris1One Aeris1One restored the auto-deploy branch August 30, 2022 14:11
@Aeris1One Aeris1One deleted the auto-deploy branch August 30, 2022 14:11
Aeris1One pushed a commit that referenced this pull request Apr 25, 2023
* Update source file en.json

* Update source file en.json

* Update source file en.json
Aeris1One pushed a commit that referenced this pull request Apr 25, 2023
* fix(readme): dead badge

* fix(stats): merge failure

* feat(antiscam): improve regex matching

* feat(antiscam): improve training logs

* fix(check): config reset bypass ignored guilds

* fix(rss): DM commands + no tweet found

* refract(stats): remove statuspage RAM usage

* fix(yt): new youtube channel URL

* refract(xp): better logs

* fix(antiscam): regex replacement

* feat(antiscam): improve training/saving process

* fix(roles-react): deleted custom emoji

* refract(tokens): improve credentials fetching

* fix(top.gg): API stats posting for axobot

* refract: rename Zbot class to Axobot

* refract(doc): rename Zbot to Axobot in doc

* refract(errors): variable name

* fix(args): circular import

* fix(logs): message update with pin/unpin

* fix(twitch): log when loop fails

* fix(help): config fetching

* feat(serverconfig): 1st version of the new system

* feat(serverconfig): update every config call

* fix(serverconfig): xp stats

* refract(alias): avoid using ctx.invoke

* feat(doc): refresh documentation

* feat(doc): use spinx book theme

* fix(doc): references and tocdepth

* fix(doc): dependencies list

* feat(doc): v4.3.0

* feat(config): french translations

* feat(modlogs): add msg creation time when deleted

* fix(find): rss with NUL date

* fix(error): slash command name

* fix(logs): difference between nick and username

* New Crowdin updates (#44)

* Update source file en.json

* Update source file en.json

* Update source file en.json

* feat(actions): upgrade to checkout v3
Aeris1One pushed a commit that referenced this pull request Apr 25, 2023
* V4.3.0 (#45)

* fix(readme): dead badge

* fix(stats): merge failure

* feat(antiscam): improve regex matching

* feat(antiscam): improve training logs

* fix(check): config reset bypass ignored guilds

* fix(rss): DM commands + no tweet found

* refract(stats): remove statuspage RAM usage

* fix(yt): new youtube channel URL

* refract(xp): better logs

* fix(antiscam): regex replacement

* feat(antiscam): improve training/saving process

* fix(roles-react): deleted custom emoji

* refract(tokens): improve credentials fetching

* fix(top.gg): API stats posting for axobot

* refract: rename Zbot class to Axobot

* refract(doc): rename Zbot to Axobot in doc

* refract(errors): variable name

* fix(args): circular import

* fix(logs): message update with pin/unpin

* fix(twitch): log when loop fails

* fix(help): config fetching

* feat(serverconfig): 1st version of the new system

* feat(serverconfig): update every config call

* fix(serverconfig): xp stats

* refract(alias): avoid using ctx.invoke

* feat(doc): refresh documentation

* feat(doc): use spinx book theme

* fix(doc): references and tocdepth

* fix(doc): dependencies list

* feat(doc): v4.3.0

* feat(config): french translations

* feat(modlogs): add msg creation time when deleted

* fix(find): rss with NUL date

* fix(error): slash command name

* fix(logs): difference between nick and username

* New Crowdin updates (#44)

* Update source file en.json

* Update source file en.json

* Update source file en.json

* feat(actions): upgrade to checkout v3

* fix(admin): update command

* fix(logs): database backup detection

* feat(tr): new guild features translations

* fix(doc): `config change` being renamed to `set`

* rmv(prefix): `prefix change` subcommand

* feat(fun): re-enable weather command

* fix(help): not working in DMs

* fix(logs): DM logs with nearly 2k characters

* fix(prefix): make it a command instead of group

* feat(tickets): better error when fails to create

* feat(tickets): add `tickets review-config` cmd

* feat(doc): v4.3.1

* fix(doc): typo in "antiscam" server logs

* feat(rss): use paginator for rss list

* refract(paginator): faster view refresh

* refract(rss): cap list to 10 feeds/page

* refract(pagination): better disabling workflow

* fix(xp): always disabled

* fix(xp): always disabled

* fix(xp): levelup channel config

* fix(xp): levelup channel config

* New Crowdin updates (#47)

* Update source file en.json

* Update source file en.json

* fix(xp): levelup check

* fix(xp): levelup check

* fix(memberchannel): error log

* feat(serverlogs): add tickets errors

* feat(doc): emojis and cards

* feat(reminder): new creation example

* feat(deps): update LRFutils

* fix(error): help command mention

* feat(modlogs): add role deletion

* feat(serverlogs): role_update logs

* feat(xp): private rank command

* fix(db): remote connection

* fix(xp): font usage

* Create .github/FUNDING.yml

* refract(ticket): better ticket summary text

* refract(serverlogs): factorise audit logs search

* feat(slash): migrate about command

* feat(usernames): disable usernames history feature

* fix(sconfig): hidden config options

* feat(stats): save audit logs search success rate

* feat(slash): migrate remindme command

* refract(lint): remove unusued import

* refract(lint): add missing space

* feat(tips): add rank card background tip

* feat(tips): implement cache

* feat(tips): lower rank card tip probability

* feat(crowdin): better commit message

* Revert "feat(crowdin): better commit message"

This reverts commit 6b9f52f.

* New Crowdin updates (#48)

* Update source file en.json

* Update source file en.json

* New translations en.json (LOLCAT)

* New translations en.json (LOLCAT)

* New translations en.json (LOLCAT)

* New translations en.json (LOLCAT)

* Update source file en.json

* New translations en.json (Finnish)

* New translations en.json (Finnish)

* New translations en.json (Finnish)

* New translations en.json (Finnish)

* New translations en.json (Finnish)

* New translations en.json (Finnish)

* New translations en.json (Finnish)

* New translations en.json (Finnish)

* New translations en.json (Finnish)

* New translations en.json (Finnish)

* New translations en.json (Finnish)

* New translations en.json (Finnish)

* Update translations %original_path% (%language%)

* Update translations %original_path% (Finnish)

* Update translations %original_path% (LOLCAT)

* Update translations %original_path% (Spanish)

* feat(readme): update d.py version badge

* feat(doc): update `profile` cmd doc

* feat(git): update pre-commits actions

* refract(requirements): cleanup requirements file

* feat(lint): cleanup all files

* feat(slash): migrate profile command

* feat(error): avoid truncating the traceback

* fix(clear): users check

* fix(mc): server status JSON error

* refract(user): cleaner user config change+query

* feat(tips): disable card tip if already changed

* Update source file en.json (#50)

* V4.3.1 (#51)

* fix(logs): database backup detection

* feat(tr): new guild features translations

* fix(doc): `config change` being renamed to `set`

* rmv(prefix): `prefix change` subcommand

* feat(fun): re-enable weather command

* fix(help): not working in DMs

* fix(logs): DM logs with nearly 2k characters

* fix(prefix): make it a command instead of group

* feat(tickets): better error when fails to create

* feat(tickets): add `tickets review-config` cmd

* feat(doc): v4.3.1

* fix(doc): typo in "antiscam" server logs

* feat(rss): use paginator for rss list

* refract(paginator): faster view refresh

* refract(rss): cap list to 10 feeds/page

* refract(pagination): better disabling workflow

* fix(xp): always disabled

* fix(xp): levelup channel config

* New Crowdin updates (#47)

* Update source file en.json

* Update source file en.json

* fix(xp): levelup check

* fix(memberchannel): error log

* feat(serverlogs): add tickets errors

* feat(doc): emojis and cards

* feat(reminder): new creation example

* feat(deps): update LRFutils

* fix(error): help command mention

* feat(modlogs): add role deletion

* feat(serverlogs): role_update logs

* feat(xp): private rank command

* fix(db): remote connection

* fix(xp): font usage

* Create .github/FUNDING.yml

* refract(ticket): better ticket summary text

* refract(serverlogs): factorise audit logs search

* feat(slash): migrate about command

* feat(usernames): disable usernames history feature

* fix(sconfig): hidden config options

* feat(stats): save audit logs search success rate

* feat(slash): migrate remindme command

* refract(lint): remove unusued import

* refract(lint): add missing space

* feat(tips): add rank card background tip

* feat(tips): implement cache

* feat(tips): lower rank card tip probability

* feat(crowdin): better commit message

* Revert "feat(crowdin): better commit message"

This reverts commit 6b9f52f.

* New Crowdin updates (#48)

* Update source file en.json

* Update source file en.json

* New translations en.json (LOLCAT)

* New translations en.json (LOLCAT)

* New translations en.json (LOLCAT)

* New translations en.json (LOLCAT)

* Update source file en.json

* New translations en.json (Finnish)

* New translations en.json (Finnish)

* New translations en.json (Finnish)

* New translations en.json (Finnish)

* New translations en.json (Finnish)

* New translations en.json (Finnish)

* New translations en.json (Finnish)

* New translations en.json (Finnish)

* New translations en.json (Finnish)

* New translations en.json (Finnish)

* New translations en.json (Finnish)

* New translations en.json (Finnish)

* Update translations %original_path% (%language%)

* Update translations %original_path% (Finnish)

* Update translations %original_path% (LOLCAT)

* Update translations %original_path% (Spanish)

* feat(readme): update d.py version badge

* feat(doc): update `profile` cmd doc

* feat(git): update pre-commits actions

* refract(requirements): cleanup requirements file

* feat(lint): cleanup all files

* feat(slash): migrate profile command

* feat(error): avoid truncating the traceback

* fix(clear): users check

* fix(mc): server status JSON error

* refract(user): cleaner user config change+query

* feat(tips): disable card tip if already changed

* Update source file en.json (#50)

* refract(action): update CodeQL triggers

* feat(doc): update documentation URLs

* fix(usernames): disable new usernames storing

* feat(rank): delete invocation for private rankcard

* fix(config): code using old table

* fix(stats): antiscam enabled count
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants