Skip to content

Commit e10a337

Browse files
authored
Merge branch 'master' into vscode-auto-format-ruff-discover-tests
2 parents 1ca3ef6 + 45d94ee commit e10a337

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+8284
-5521
lines changed

.github/dependabot.yml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,33 @@ updates:
77
interval: daily
88
commit-message:
99
prefix:
10-
# Python
11-
- package-ecosystem: pip
12-
directory: /
10+
# Python uv
11+
- package-ecosystem: uv
12+
directory: /backend
1313
schedule:
14-
interval: daily
14+
interval: weekly
1515
commit-message:
1616
prefix:
1717
# npm
1818
- package-ecosystem: npm
19-
directory: /
19+
directory: /frontend
2020
schedule:
21-
interval: daily
21+
interval: weekly
2222
commit-message:
2323
prefix:
24+
ignore:
25+
- dependency-name: "@hey-api/openapi-ts"
2426
# Docker
2527
- package-ecosystem: docker
28+
directories:
29+
- /backend
30+
- /frontend
31+
schedule:
32+
interval: weekly
33+
commit-message:
34+
prefix:
35+
# Docker Compose
36+
- package-ecosystem: docker-compose
2637
directory: /
2738
schedule:
2839
interval: weekly

.github/workflows/deploy-production.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ jobs:
2727
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
2828
steps:
2929
- name: Checkout
30-
uses: actions/checkout@v4
30+
uses: actions/checkout@v5
3131
- run: docker compose -f docker-compose.yml --project-name ${{ secrets.STACK_NAME_PRODUCTION }} build
3232
- run: docker compose -f docker-compose.yml --project-name ${{ secrets.STACK_NAME_PRODUCTION }} up -d

.github/workflows/deploy-staging.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ jobs:
2727
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
2828
steps:
2929
- name: Checkout
30-
uses: actions/checkout@v4
30+
uses: actions/checkout@v5
3131
- run: docker compose -f docker-compose.yml --project-name ${{ secrets.STACK_NAME_STAGING }} build
3232
- run: docker compose -f docker-compose.yml --project-name ${{ secrets.STACK_NAME_STAGING }} up -d
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: "Conflict detector"
2+
on:
3+
push:
4+
pull_request_target:
5+
types: [synchronize]
6+
7+
jobs:
8+
main:
9+
permissions:
10+
contents: read
11+
pull-requests: write
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Check if PRs have merge conflicts
15+
uses: eps1lon/actions-label-merge-conflict@v3
16+
with:
17+
dirtyLabel: "conflicts"
18+
repoToken: "${{ secrets.GITHUB_TOKEN }}"
19+
commentOnDirty: "This pull request has a merge conflict that needs to be resolved."

.github/workflows/generate-client.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
# For PRs from forks
16-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v5
1717
# For PRs from the same repo
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v5
1919
if: ( github.event_name != 'pull_request' || github.secret_source == 'Actions' )
2020
with:
2121
ref: ${{ github.head_ref }}
2222
token: ${{ secrets.FULL_STACK_FASTAPI_TEMPLATE_REPO_TOKEN }}
23-
- uses: actions/setup-node@v4
23+
- uses: actions/setup-node@v6
2424
with:
2525
node-version: lts/*
26-
- uses: actions/setup-python@v5
26+
- uses: actions/setup-python@v6
2727
with:
2828
python-version: "3.10"
2929
- name: Install uv
30-
uses: astral-sh/setup-uv@v5
30+
uses: astral-sh/setup-uv@v7
3131
with:
3232
version: "0.4.15"
3333
enable-cache: true
@@ -39,7 +39,6 @@ jobs:
3939
- run: uv run bash scripts/generate-client.sh
4040
env:
4141
VIRTUAL_ENV: backend/.venv
42-
ENVIRONMENT: production
4342
SECRET_KEY: just-for-generating-client
4443
POSTGRES_PASSWORD: just-for-generating-client
4544
FIRST_SUPERUSER_PASSWORD: just-for-generating-client

.github/workflows/issue-manager.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
env:
2828
GITHUB_CONTEXT: ${{ toJson(github) }}
2929
run: echo "$GITHUB_CONTEXT"
30-
- uses: tiangolo/issue-manager@0.5.1
30+
- uses: tiangolo/issue-manager@0.6.0
3131
with:
3232
token: ${{ secrets.GITHUB_TOKEN }}
3333
config: >
@@ -38,7 +38,10 @@ jobs:
3838
},
3939
"waiting": {
4040
"delay": 2628000,
41-
"message": "As this PR has been waiting for the original user for a while but seems to be inactive, it's now going to be closed. But if there's anyone interested, feel free to create a new PR."
41+
"message": "As this PR has been waiting for the original user for a while but seems to be inactive, it's now going to be closed. But if there's anyone interested, feel free to create a new PR.",
42+
"reminder": {
43+
"before": "P3D",
44+
"message": "Heads-up: this will be closed in 3 days unless there’s new activity."
4245
},
4346
"invalid": {
4447
"delay": 0,

.github/workflows/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
pull-requests: write
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/labeler@v5
19+
- uses: actions/labeler@v6
2020
if: ${{ github.event.action != 'labeled' && github.event.action != 'unlabeled' }}
2121
- run: echo "Done adding labels"
2222
# Run this after labeler applied labels

.github/workflows/latest-changes.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ jobs:
2626
env:
2727
GITHUB_CONTEXT: ${{ toJson(github) }}
2828
run: echo "$GITHUB_CONTEXT"
29-
- uses: actions/checkout@v4
29+
- uses: actions/checkout@v5
3030
with:
3131
# To allow latest-changes to commit to the main branch
3232
token: ${{ secrets.LATEST_CHANGES }}
33-
- uses: tiangolo/latest-changes@0.3.2
33+
- uses: tiangolo/latest-changes@0.4.0
3434
with:
3535
token: ${{ secrets.GITHUB_TOKEN }}
3636
latest_changes_file: ./release-notes.md

.github/workflows/lint-backend.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v5
1818
- name: Set up Python
19-
uses: actions/setup-python@v5
19+
uses: actions/setup-python@v6
2020
with:
2121
python-version: "3.10"
2222
- name: Install uv
23-
uses: astral-sh/setup-uv@v5
23+
uses: astral-sh/setup-uv@v7
2424
with:
2525
version: "0.4.15"
2626
enable-cache: true

.github/workflows/playwright.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
outputs:
2323
changed: ${{ steps.filter.outputs.changed }}
2424
steps:
25-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v5
2626
# For pull requests it's not necessary to checkout the code but for the main branch it is
2727
- uses: dorny/paths-filter@v3
2828
id: filter
@@ -47,11 +47,11 @@ jobs:
4747
shardTotal: [4]
4848
fail-fast: false
4949
steps:
50-
- uses: actions/checkout@v4
51-
- uses: actions/setup-node@v4
50+
- uses: actions/checkout@v5
51+
- uses: actions/setup-node@v6
5252
with:
5353
node-version: lts/*
54-
- uses: actions/setup-python@v5
54+
- uses: actions/setup-python@v6
5555
with:
5656
python-version: '3.10'
5757
- name: Setup tmate session
@@ -60,7 +60,7 @@ jobs:
6060
with:
6161
limit-access-to-actor: true
6262
- name: Install uv
63-
uses: astral-sh/setup-uv@v5
63+
uses: astral-sh/setup-uv@v7
6464
with:
6565
version: "0.4.15"
6666
enable-cache: true
@@ -93,15 +93,15 @@ jobs:
9393
if: ${{ !cancelled() && needs.changes.outputs.changed == 'true' }}
9494
runs-on: ubuntu-latest
9595
steps:
96-
- uses: actions/checkout@v4
97-
- uses: actions/setup-node@v4
96+
- uses: actions/checkout@v5
97+
- uses: actions/setup-node@v6
9898
with:
9999
node-version: 20
100100
- name: Install dependencies
101101
run: npm ci
102102
working-directory: frontend
103103
- name: Download blob reports from GitHub Actions Artifacts
104-
uses: actions/download-artifact@v4
104+
uses: actions/download-artifact@v5
105105
with:
106106
path: frontend/all-blob-reports
107107
pattern: blob-report-*

0 commit comments

Comments
 (0)