Skip to content

Commit

Permalink
Merge branch 'main' into feat/splitBackendAndFrontend
Browse files Browse the repository at this point in the history
  • Loading branch information
Johannes-Andersen committed Dec 20, 2023
1 parent 0d85289 commit 41a830a
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 30 deletions.
14 changes: 7 additions & 7 deletions .github/ISSUE_TEMPLATE/bug.yml
@@ -1,6 +1,6 @@
name: Bug Report
description: Create a bug report for WAAS
labels: ['bug']
labels: ["type/bug"]
body:
- type: textarea
attributes:
Expand All @@ -13,12 +13,12 @@ body:
label: Which area(s) of the code does the issue occur in?
multiple: true
options:
- 'Website'
- 'Worker'
- 'Api'
- 'Mailer'
- 'Webhook'
- 'Other'
- "Website"
- "Worker"
- "Api"
- "Mailer"
- "Webhook"
- "Other"
- type: textarea
attributes:
label: To Reproduce
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature.yml
@@ -1,6 +1,6 @@
name: Feature Request
description: Create a feature request for WAAS
labels: ['enhancement']
labels: ["type/feature"]
body:
- type: textarea
attributes:
Expand Down
16 changes: 0 additions & 16 deletions .github/dependabot.yml

This file was deleted.

21 changes: 21 additions & 0 deletions .github/renovate.json
@@ -0,0 +1,21 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended",
"group:monorepos",
"group:recommended",
"replacements:all",
"workarounds:all"
],
"labels": ["type/dependencies"],
"vulnerabilityAlerts": {
"labels": ["type/dependencies", "area/security", "priority/critical"]
},
"rollbackPrs": true,
"prHourlyLimit": 10,
"lockFileMaintenance": {
"enabled": true
},
"configMigration": true,
"timezone": "Europe/Oslo"
}
8 changes: 4 additions & 4 deletions .github/workflows/codeql.yml
Expand Up @@ -38,11 +38,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -56,7 +56,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
Expand All @@ -69,6 +69,6 @@ jobs:
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Expand Up @@ -24,7 +24,7 @@ jobs:
--health-retries 5
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install dependencies
run: pip install -r requirements.txt
- name: Install requirements (ffmpeg)
Expand Down
2 changes: 1 addition & 1 deletion backend/requirements.txt
Expand Up @@ -5,7 +5,7 @@ redis==5.0.1
rq==1.15.1
python-dotenv==1.0.0
gunicorn==21.2.0
sentry-sdk==1.36.0
sentry-sdk==1.39.1
blinker==1.7.0
Werkzeug==3.0.1
Unidecode==1.3.7
Expand Down

0 comments on commit 41a830a

Please sign in to comment.