Skip to content

Commit d627ecb

Browse files
authored
Merge branch 'main' into main
2 parents acd753e + 321cd93 commit d627ecb

File tree

5 files changed

+14
-9
lines changed

5 files changed

+14
-9
lines changed

.github/workflows/deploy-docs.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,19 @@ jobs:
5555
# hashFiles returns an empty string if there are no files
5656
if: hashFiles('./site/*')
5757
id: deploy
58-
uses: cloudflare/pages-action@v1
58+
env:
59+
PROJECT_NAME: sqlmodel
60+
BRANCH: ${{ ( github.event.workflow_run.head_repository.full_name == github.repository && github.event.workflow_run.head_branch == 'main' && 'main' ) || ( github.event.workflow_run.head_sha ) }}
61+
uses: cloudflare/wrangler-action@v3
5962
with:
6063
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
6164
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
62-
projectName: sqlmodel
63-
directory: './site'
64-
gitHubToken: ${{ secrets.GITHUB_TOKEN }}
65-
branch: ${{ ( github.event.workflow_run.head_repository.full_name == github.repository && github.event.workflow_run.head_branch == 'main' && 'main' ) || ( github.event.workflow_run.head_sha ) }}
65+
command: pages deploy ./site --project-name=${{ env.PROJECT_NAME }} --branch=${{ env.BRANCH }}
6666
- name: Comment Deploy
6767
run: python ./scripts/deploy_docs_status.py
6868
env:
6969
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
70-
DEPLOY_URL: ${{ steps.deploy.outputs.url }}
70+
DEPLOY_URL: ${{ steps.deploy.outputs.deployment-url }}
7171
COMMIT_SHA: ${{ github.event.workflow_run.head_sha }}
7272
RUN_ID: ${{ github.run_id }}
7373
IS_DONE: "true"

.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/[email protected].0
30+
- uses: tiangolo/[email protected].1
3131
with:
3232
token: ${{ secrets.GITHUB_TOKEN }}
3333
config: >

.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.6.2
17+
rev: v0.6.5
1818
hooks:
1919
- id: ruff
2020
args:

docs/release-notes.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,15 @@
44

55
### Docs
66

7+
* ✏️ Fix typo in documentation. PR [#1106](https://github.com/fastapi/sqlmodel/pull/1106) by [@Solipsistmonkey](https://github.com/Solipsistmonkey).
78
* 📝 Remove highlights in `indexes.md` . PR [#1100](https://github.com/fastapi/sqlmodel/pull/1100) by [@alejsdev](https://github.com/alejsdev).
89

910
### Internal
1011

12+
* 👷 Update worfkow deploy-docs-notify URL. PR [#1126](https://github.com/fastapi/sqlmodel/pull/1126) by [@tiangolo](https://github.com/tiangolo).
13+
* 👷 Upgrade Cloudflare GitHub Action. PR [#1124](https://github.com/fastapi/sqlmodel/pull/1124) by [@tiangolo](https://github.com/tiangolo).
14+
*[pre-commit.ci] pre-commit autoupdate. PR [#1097](https://github.com/fastapi/sqlmodel/pull/1097) by [@pre-commit-ci[bot]](https://github.com/apps/pre-commit-ci).
15+
* ⬆ Bump tiangolo/issue-manager from 0.5.0 to 0.5.1. PR [#1107](https://github.com/fastapi/sqlmodel/pull/1107) by [@dependabot[bot]](https://github.com/apps/dependabot).
1116
* 👷 Update `issue-manager.yml`. PR [#1103](https://github.com/fastapi/sqlmodel/pull/1103) by [@tiangolo](https://github.com/tiangolo).
1217
* 👷 Fix coverage processing in CI, one name per matrix run. PR [#1104](https://github.com/fastapi/sqlmodel/pull/1104) by [@tiangolo](https://github.com/tiangolo).
1318
* 💚 Set `include-hidden-files` to `True` when using the `upload-artifact` GH action. PR [#1098](https://github.com/fastapi/sqlmodel/pull/1098) by [@svlandeg](https://github.com/svlandeg).

docs/tutorial/one.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -710,4 +710,4 @@ Hero: None
710710

711711
## Recap
712712

713-
As querying the SQL database for a single row is a common operation, you know have several tools to do it in a short and simple way. 🎉
713+
As querying the SQL database for a single row is a common operation, you now have several tools to do it in a short and simple way. 🎉

0 commit comments

Comments
 (0)