Compare commits

...
Author SHA1 Message Date
imcompiling 136702654e Ran ruff check --fix. 2025-02-17 14:56:33 -05:00
imcompiling 23adad403a Merge branch '66-update-build-process'
build_develop / build (push) Successful in 56s
2025-02-17 14:50:36 -05:00
imcompiling 3a72d9f0e7 Update renovatebot to not automatically merge minor dockerfile changes. 2025-02-17 14:45:08 -05:00
imcompiling da0acb2827 Merge pull request 'Update actions/checkout action to v4' (#72) from renovate/actions-checkout-4.x into main
build_develop / build (push) Successful in 48s
Reviewed-on: #72
2025-02-16 11:25:55 -05:00
renovate-bot 0baffe96f3 Update actions/checkout action to v4 2025-02-16 05:01:09 +00:00
5 changed files with 15 additions and 5 deletions
+1 -1
View File
@@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout Code - name: Checkout Code
uses: actions/checkout@v3 uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Install Docker - name: Install Docker
+1 -1
View File
@@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout Code - name: Checkout Code
uses: actions/checkout@v3 uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Install Docker - name: Install Docker
+1 -1
View File
@@ -12,8 +12,8 @@ from sqlalchemy.orm import Session
# pylint: disable=import-error # pylint: disable=import-error
from classes.submission import SubmissionState from classes.submission import SubmissionState
from main import submission_objects
from database_setup.sql_data_classes import Category, Guild, engine from database_setup.sql_data_classes import Category, Guild, engine
from main import submission_objects
class SubmissionListener(commands.Cog, name="Message Listener"): class SubmissionListener(commands.Cog, name="Message Listener"):
+1 -1
View File
@@ -7,8 +7,8 @@ from sqlalchemy.orm import Session, aliased
# pylint: disable=import-error # pylint: disable=import-error
from classes.submission import Submission, SubmissionState from classes.submission import Submission, SubmissionState
from main import submission_objects
from database_setup.sql_data_classes import Category, CategoryGroup, Guild, engine from database_setup.sql_data_classes import Category, CategoryGroup, Guild, engine
from main import submission_objects
from .verification_view import VerificationView from .verification_view import VerificationView
+11 -1
View File
@@ -3,6 +3,10 @@
"lockFileMaintenance": { "lockFileMaintenance": {
"automerge": true "automerge": true
}, },
"major": {
"automerge": false,
"automergeType": "pr"
},
"minor": { "minor": {
"automerge": true, "automerge": true,
"automergeType": "branch" "automergeType": "branch"
@@ -15,5 +19,11 @@
"automerge": true, "automerge": true,
"automergeType": "branch" "automergeType": "branch"
}, },
"ignoreTests": true "ignoreTests": true,
"dockerfile": {
"minor": {
"automerge": false,
"automergeType": "pr"
}
}
} }