Skip to content

Commit f0c1c52

Browse files
authored
Merge branch 'master' into dependabot/uv/lxml-6.1.0
2 parents 6ae0b29 + 5027f2e commit f0c1c52

28 files changed

Lines changed: 468 additions & 363 deletions

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Domain
22
# This would be set to the production domain with an env var on deployment
3-
# used by Traefik to transmit traffic and aqcuire TLS certificates
3+
# used by Traefik to transmit traffic and acquire TLS certificates
44
DOMAIN=localhost
55
# To test the local Traefik config
66
# DOMAIN=localhost.tiangolo.com

.github/DISCUSSION_TEMPLATE/questions.yml

Lines changed: 0 additions & 118 deletions
This file was deleted.

.github/FUNDING.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/privileged.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

.github/dependabot.yml

Lines changed: 52 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,43 +4,91 @@ updates:
44
- package-ecosystem: github-actions
55
directory: /
66
schedule:
7-
interval: daily
7+
interval: weekly
8+
cooldown:
9+
default-days: 7
810
commit-message:
911
prefix:
10-
labels: [dependencies, internal]
12+
labels:
13+
- "internal"
14+
- "dependencies"
15+
- "github_actions"
16+
groups:
17+
github-actions:
18+
patterns:
19+
- "*"
1120
# Python uv
1221
- package-ecosystem: uv
1322
directory: /
1423
schedule:
1524
interval: weekly
25+
cooldown:
26+
default-days: 7
1627
commit-message:
1728
prefix:
1829
labels: [dependencies, internal]
30+
groups:
31+
python-packages:
32+
patterns:
33+
- "*"
1934
# bun
2035
- package-ecosystem: bun
2136
directory: /
2237
schedule:
2338
interval: weekly
39+
cooldown:
40+
default-days: 7
2441
commit-message:
2542
prefix:
2643
labels: [dependencies, internal]
2744
ignore:
2845
- dependency-name: "@hey-api/openapi-ts"
46+
groups:
47+
npm-packages:
48+
patterns:
49+
- "*"
2950
# Docker
3051
- package-ecosystem: docker
3152
directories:
3253
- /backend
3354
- /frontend
3455
schedule:
3556
interval: weekly
57+
cooldown:
58+
default-days: 7
3659
commit-message:
3760
prefix:
38-
labels: [dependencies, internal]
61+
groups:
62+
docker:
63+
patterns:
64+
- "*"
3965
# Docker Compose
4066
- package-ecosystem: docker-compose
4167
directory: /
4268
schedule:
4369
interval: weekly
70+
cooldown:
71+
default-days: 7
4472
commit-message:
4573
prefix:
46-
labels: [dependencies, internal]
74+
groups:
75+
docker-compose:
76+
patterns:
77+
- "*"
78+
# pre-commit
79+
- package-ecosystem: "pre-commit"
80+
directory: "/"
81+
schedule:
82+
interval: "weekly"
83+
cooldown:
84+
default-days: 7
85+
commit-message:
86+
prefix:
87+
labels:
88+
- "internal"
89+
- "dependencies"
90+
- "pre-commit"
91+
groups:
92+
pre-commit:
93+
patterns:
94+
- "*"
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
name: Add to Project
22

33
on:
4-
pull_request_target:
4+
pull_request_target: # zizmor: ignore[dangerous-triggers]
55
issues:
66
types:
77
- opened
88
- reopened
99

10+
permissions: {}
11+
1012
jobs:
1113
add-to-project:
1214
name: Add to project
1315
runs-on: ubuntu-latest
16+
timeout-minutes: 5
1417
steps:
15-
- uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e # v1.0.2
18+
- uses: actions/add-to-project@5afcf98fcd03f1c2f92c3c83f58ae24323cc57fd # v2.0.0
1619
with:
1720
project-url: https://github.com/orgs/fastapi/projects/2
18-
github-token: ${{ secrets.PROJECTS_TOKEN }}
21+
github-token: ${{ secrets.PROJECTS_TOKEN }} # zizmor: ignore[secrets-outside-env]

.github/workflows/deploy-production.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@ on:
55
types:
66
- published
77

8+
permissions: {}
9+
810
jobs:
911
deploy:
12+
environment: production
1013
# Do not deploy in the main repository, only in user projects
1114
if: github.repository_owner != 'fastapi'
1215
runs-on:
@@ -28,5 +31,7 @@ jobs:
2831
steps:
2932
- name: Checkout
3033
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
34+
with:
35+
persist-credentials: false
3136
- run: docker compose -f compose.yml --project-name ${{ secrets.STACK_NAME_PRODUCTION }} build
3237
- run: docker compose -f compose.yml --project-name ${{ secrets.STACK_NAME_PRODUCTION }} up -d

.github/workflows/deploy-staging.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@ on:
55
branches:
66
- master
77

8+
permissions: {}
9+
810
jobs:
911
deploy:
12+
environment: staging
1013
# Do not deploy in the main repository, only in user projects
1114
if: github.repository_owner != 'fastapi'
1215
runs-on:
@@ -28,5 +31,7 @@ jobs:
2831
steps:
2932
- name: Checkout
3033
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
34+
with:
35+
persist-credentials: false
3136
- run: docker compose -f compose.yml --project-name ${{ secrets.STACK_NAME_STAGING }} build
3237
- run: docker compose -f compose.yml --project-name ${{ secrets.STACK_NAME_STAGING }} up -d

.github/workflows/detect-conflicts.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
name: "Conflict detector"
22
on:
33
push:
4-
pull_request_target:
4+
pull_request_target: # zizmor: ignore[dangerous-triggers]
55
types: [synchronize]
66

7+
permissions: {}
8+
79
jobs:
810
main:
911
permissions:
1012
contents: read
1113
pull-requests: write
1214
runs-on: ubuntu-latest
15+
timeout-minutes: 5
1316
steps:
1417
- name: Check if PRs have merge conflicts
15-
uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3.0.3
18+
uses: eps1lon/actions-label-merge-conflict@0273be72a0bbd58fcd71d0d6c02c209b50d1e5e1 # v3.1.0
1619
with:
1720
dirtyLabel: "conflicts"
1821
repoToken: "${{ secrets.GITHUB_TOKEN }}"

0 commit comments

Comments
 (0)