From 098912644ed4187812f52ff82008be6b8a9d27da Mon Sep 17 00:00:00 2001 From: Ryan Conrad Date: Mon, 2 Jun 2025 23:26:02 -0500 Subject: [PATCH 1/5] update actions --- .github/linters/.ecrc | 6 +++--- .github/linters/.python-lint | 3 +-- .github/workflows/lint.yaml | 14 +++++++++++--- .github/workflows/pr-target-branch.yml | 4 ++-- .github/workflows/publish-beta.yml | 2 +- .github/workflows/publish-main.yml | 2 +- 6 files changed, 19 insertions(+), 12 deletions(-) diff --git a/.github/linters/.ecrc b/.github/linters/.ecrc index ecb3691..0e4a8e9 100644 --- a/.github/linters/.ecrc +++ b/.github/linters/.ecrc @@ -2,11 +2,11 @@ "Verbose": false, "Debug": false, "IgnoreDefaults": false, - "SpacesAftertabs": false, + "SpacesAfterTabs": false, "NoColor": false, "exclude": [ - ".git", - ".vscode" + ".git", + ".vscode" ], "AllowedContentTypes": [], "PassedFiles": [], diff --git a/.github/linters/.python-lint b/.github/linters/.python-lint index 7284b82..78c3897 100644 --- a/.github/linters/.python-lint +++ b/.github/linters/.python-lint @@ -468,5 +468,4 @@ valid-metaclass-classmethod-first-arg=mcs # Exceptions that will emit a warning when being caught. Defaults to # "Exception" -overgeneral-exceptions=builtins.BaseException, - builtins.Exception +overgeneral-exceptions=builtins.BaseException, builtins.Exception diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index c09ada5..84ec013 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -1,6 +1,6 @@ --- name: Lint Code Base -on: +"on": push: branches: - "**" # All branches @@ -20,14 +20,22 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: Super-Linter - uses: super-linter/super-linter/slim@v5 + uses: super-linter/super-linter/slim@v7 env: VALIDATE_ALL_CODEBASE: false DEFAULT_BRANCH: develop GITHUB_TOKEN: ${{ github.token }} VALIDATE_PYTHON_FLAKE8: false VALIDATE_PYTHON_MYPY: false + VALIDATE_PYTHON_PYINK: false + VALIDATE_CHECKOV: false + VALIDATE_YAML_PRETTIER: false + VALIDATE_JSON_PRETTIER: false + VALIDATE_MARKDOWN_PRETTIER: false + FIX_MARKDOWN_PRETTIER: false + FIX_YAML_PRETTIER: false + FIX_JSON_PRETTIER: false diff --git a/.github/workflows/pr-target-branch.yml b/.github/workflows/pr-target-branch.yml index 17e34ad..185e031 100644 --- a/.github/workflows/pr-target-branch.yml +++ b/.github/workflows/pr-target-branch.yml @@ -1,6 +1,6 @@ --- name: Correct PR Branch Check -on: +"on": pull_request: branches: - "main" @@ -22,7 +22,7 @@ jobs: # if it is, comment on the PR and close it. # and set the check as failed. - name: Check PR Branch - uses: actions/github-script@v6 + uses: actions/github-script@v7 with: github-token: ${{ secrets.GITHUB_TOKEN }} script: | diff --git a/.github/workflows/publish-beta.yml b/.github/workflows/publish-beta.yml index 252af28..5aa6a42 100644 --- a/.github/workflows/publish-beta.yml +++ b/.github/workflows/publish-beta.yml @@ -1,6 +1,6 @@ --- name: Docker Build Publish Beta -on: +"on": push: branches: - '**' diff --git a/.github/workflows/publish-main.yml b/.github/workflows/publish-main.yml index 3f916e0..051dad0 100644 --- a/.github/workflows/publish-main.yml +++ b/.github/workflows/publish-main.yml @@ -1,6 +1,6 @@ --- name: Docker Build Publish -on: +"on": push: branches: - develop From d0e3d673f26e1b3d7d33269d8e8f1aa669a1ee5b Mon Sep 17 00:00:00 2001 From: Ryan Conrad Date: Mon, 2 Jun 2025 23:27:00 -0500 Subject: [PATCH 2/5] update actions --- .github/workflows/publish-beta.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-beta.yml b/.github/workflows/publish-beta.yml index 5aa6a42..6066410 100644 --- a/.github/workflows/publish-beta.yml +++ b/.github/workflows/publish-beta.yml @@ -52,7 +52,7 @@ jobs: - name: Build and Push GHCR id: docker_build - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: provenance: false push: true From a7e082bec5513169a11a28c17373cb00f6704913 Mon Sep 17 00:00:00 2001 From: Ryan Conrad Date: Mon, 2 Jun 2025 23:37:01 -0500 Subject: [PATCH 3/5] update actions --- .github/workflows/publish-main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-main.yml b/.github/workflows/publish-main.yml index 051dad0..545c49d 100644 --- a/.github/workflows/publish-main.yml +++ b/.github/workflows/publish-main.yml @@ -70,7 +70,7 @@ jobs: - name: Build and Push GHCR id: docker_build - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: provenance: false push: true From 27fb2b64f4370d343e27aacb2a8fe7923c841075 Mon Sep 17 00:00:00 2001 From: Ryan Conrad Date: Mon, 2 Jun 2025 23:40:10 -0500 Subject: [PATCH 4/5] update actions --- .github/workflows/publish-main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-main.yml b/.github/workflows/publish-main.yml index 545c49d..6d855a2 100644 --- a/.github/workflows/publish-main.yml +++ b/.github/workflows/publish-main.yml @@ -70,7 +70,7 @@ jobs: - name: Build and Push GHCR id: docker_build - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: provenance: false push: true From 6f861503e1f5ab11efad2cf6cdda7c811bb9479b Mon Sep 17 00:00:00 2001 From: Ryan Conrad Date: Mon, 2 Jun 2025 23:48:23 -0500 Subject: [PATCH 5/5] fix some lint errors --- bot/cogs/lib/enums/system_actions.py | 7 ++++--- bot/cogs/lib/enums/user_channel_state.py | 7 ++++--- bot/cogs/lib/models/default_prefixes.py | 16 ++++++++-------- languages/es-mx.json | 2 +- metrics/voicecreate.py | 1 - 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/bot/cogs/lib/enums/system_actions.py b/bot/cogs/lib/enums/system_actions.py index d2eb2dc..cd5d7ff 100644 --- a/bot/cogs/lib/enums/system_actions.py +++ b/bot/cogs/lib/enums/system_actions.py @@ -1,6 +1,7 @@ from enum import Enum + class SystemActions(Enum): - # System actions - CREATE_VOICE_CHANNEL = 0 - CREATE_STAGE_CHANNEL = 1 + # System actions + CREATE_VOICE_CHANNEL = 0 + CREATE_STAGE_CHANNEL = 1 diff --git a/bot/cogs/lib/enums/user_channel_state.py b/bot/cogs/lib/enums/user_channel_state.py index 7c0f236..94f53be 100644 --- a/bot/cogs/lib/enums/user_channel_state.py +++ b/bot/cogs/lib/enums/user_channel_state.py @@ -1,6 +1,7 @@ from enum import Enum + class UserChannelState(Enum): - # System actions - JOIN = 0 - LEAVE = 1 + # System actions + JOIN = 0 + LEAVE = 1 diff --git a/bot/cogs/lib/models/default_prefixes.py b/bot/cogs/lib/models/default_prefixes.py index efe140f..33a839e 100644 --- a/bot/cogs/lib/models/default_prefixes.py +++ b/bot/cogs/lib/models/default_prefixes.py @@ -1,10 +1,10 @@ class DefaultPrefixes: - VALUE = [ - ".voice ", - "?voice ", - "!voice ", - ".vcb ", - "?vcb ", - "!vcb " -] + VALUE = [ + ".voice ", + "?voice ", + "!voice ", + ".vcb ", + "?vcb ", + "!vcb " + ] diff --git a/languages/es-mx.json b/languages/es-mx.json index 25ee591..8208f5d 100644 --- a/languages/es-mx.json +++ b/languages/es-mx.json @@ -152,7 +152,7 @@ "help_info_more_help": "Más ayuda", "help_info_admin_title": "Comando de administración", "help_no_command": "El comando `{{command}}` no se encuentra en la ayuda.", - "help_command_channel": "**Comandos basados ​​en canales**", + "help_command_channel": "**Comandos basados en canales**", "help_command_name": "**Cambia el nombre de tu canal**\n\nDejar el nombre vacío generará un nombre aleatorio.", "help_command_save": "**Guarda la configuración de tu canal**", "help_command_enable_auto_game": "**Cambia automáticamente tu canal por el nombre del juego al que estás jugando**", diff --git a/metrics/voicecreate.py b/metrics/voicecreate.py index eee4aaa..7d3bea3 100644 --- a/metrics/voicecreate.py +++ b/metrics/voicecreate.py @@ -242,4 +242,3 @@ def fetch(self): except Exception as ex: self.log.error(0, f"{self._module}.{self._class}.{_method}", str(ex), traceback.format_exc()) self.errors.labels(source="exporter_db_close").set(1) - \ No newline at end of file