Skip to content

Commit 7463f0c

Browse files
YuriiMotovYuriiMotov
authored
Merge branch 'main' into main
2 parents daf3975 + a85de91 commit 7463f0c

25 files changed

+308
-69
lines changed

‎.github/workflows/build-docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
run: echo "$GITHUB_CONTEXT"
5656
- uses: actions/checkout@v5
5757
- name: Set up Python
58-
uses: actions/setup-python@v5
58+
uses: actions/setup-python@v6
5959
with:
6060
python-version: "3.11"
6161
- name: Setup uv

‎.github/workflows/deploy-docs.yml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
run: echo "$GITHUB_CONTEXT"
2626
- uses: actions/checkout@v5
2727
- name: Set up Python
28-
uses: actions/setup-python@v5
28+
uses: actions/setup-python@v6
2929
with:
3030
python-version: "3.11"
3131
- name: Setup uv
@@ -44,7 +44,7 @@ jobs:
4444
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4545
COMMIT_SHA: ${{ github.event.workflow_run.head_sha }}
4646
RUN_ID: ${{ github.run_id }}
47-
47+
STATE: "pending"
4848
- name: Clean site
4949
run: |
5050
rm -rf ./site
@@ -68,11 +68,19 @@ jobs:
6868
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
6969
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
7070
command: pages deploy ./site --project-name=${{ env.PROJECT_NAME }} --branch=${{ env.BRANCH }}
71+
- name: Deploy Docs Status Error
72+
if: failure()
73+
run: python ./scripts/deploy_docs_status.py
74+
env:
75+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
76+
COMMIT_SHA: ${{ github.event.workflow_run.head_sha }}
77+
RUN_ID: ${{ github.run_id }}
78+
STATE: "error"
7179
- name: Comment Deploy
7280
run: python ./scripts/deploy_docs_status.py
7381
env:
7482
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7583
DEPLOY_URL: ${{ steps.deploy.outputs.deployment-url }}
7684
COMMIT_SHA: ${{ github.event.workflow_run.head_sha }}
7785
RUN_ID: ${{ github.run_id }}
78-
IS_DONE: "true"
86+
STATE: "success"

‎.github/workflows/detect-conflicts.yml‎

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/issue-manager.yml‎

Lines changed: 1 addition & 1 deletion
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: >

‎.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/publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
steps:
2525
- uses: actions/checkout@v5
2626
- name: Set up Python
27-
uses: actions/setup-python@v5
27+
uses: actions/setup-python@v6
2828
with:
2929
python-version: "3.11"
3030
- name: Install build dependencies
@@ -34,4 +34,4 @@ jobs:
3434
TIANGOLO_BUILD_PACKAGE: ${{ matrix.package }}
3535
run: python -m build
3636
- name: Publish
37-
uses: pypa/gh-action-pypi-publish@v1.12.4
37+
uses: pypa/gh-action-pypi-publish@v1.13.0

‎.github/workflows/smokeshow.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- uses: actions/checkout@v5
20-
- uses: actions/setup-python@v5
20+
- uses: actions/setup-python@v6
2121
with:
2222
python-version: '3.9'
2323
- name: Setup uv

‎.github/workflows/test-redistribute.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
run: echo "$GITHUB_CONTEXT"
2525
- uses: actions/checkout@v5
2626
- name: Set up Python
27-
uses: actions/setup-python@v5
27+
uses: actions/setup-python@v6
2828
with:
2929
python-version: "3.10"
3030
- name: Install build dependencies

‎.github/workflows/test.yml‎

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,38 @@ jobs:
2525
test:
2626
strategy:
2727
matrix:
28-
os: [ ubuntu-latest ]
29-
python-version:
30-
- "3.8"
31-
- "3.9"
32-
- "3.10"
33-
- "3.11"
34-
- "3.12"
35-
- "3.13"
28+
os: [ ubuntu-latest, windows-latest, macos-latest ]
29+
python-version: [ "3.14" ]
3630
pydantic-version:
37-
- pydantic-v1
3831
- pydantic-v2
32+
include:
33+
- os: macos-latest
34+
python-version: "3.8"
35+
pydantic-version: pydantic-v1
36+
- os: windows-latest
37+
python-version: "3.9"
38+
pydantic-version: pydantic-v2
39+
- os: ubuntu-latest
40+
python-version: "3.10"
41+
pydantic-version: pydantic-v1
42+
- os: macos-latest
43+
python-version: "3.11"
44+
pydantic-version: pydantic-v2
45+
- os: windows-latest
46+
python-version: "3.12"
47+
pydantic-version: pydantic-v1
48+
- os: ubuntu-latest
49+
python-version: "3.13"
50+
pydantic-version: pydantic-v1
51+
- os: macos-latest
52+
python-version: "3.13"
53+
pydantic-version: pydantic-v2
3954
fail-fast: false
4055
runs-on: ${{ matrix.os }}
4156
steps:
4257
- uses: actions/checkout@v5
4358
- name: Set up Python
44-
uses: actions/setup-python@v5
59+
uses: actions/setup-python@v6
4560
with:
4661
python-version: ${{ matrix.python-version }}
4762
- name: Setup uv
@@ -78,7 +93,7 @@ jobs:
7893
- name: Store coverage files
7994
uses: actions/upload-artifact@v4
8095
with:
81-
name: coverage-${{ matrix.python-version }}-${{ matrix.pydantic-version }}
96+
name: coverage-${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.pydantic-version }}
8297
path: coverage
8398
include-hidden-files: true
8499

@@ -88,7 +103,7 @@ jobs:
88103
runs-on: ubuntu-latest
89104
steps:
90105
- uses: actions/checkout@v5
91-
- uses: actions/setup-python@v5
106+
- uses: actions/setup-python@v6
92107
with:
93108
python-version: '3.13'
94109
- name: Setup uv

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ repos:
1414
- id: end-of-file-fixer
1515
- id: trailing-whitespace
1616
- repo: https://github.com/astral-sh/ruff-pre-commit
17-
rev: v0.12.9
17+
rev: v0.13.3
1818
hooks:
1919
- id: ruff
2020
args:

0 commit comments

Comments
 (0)