Merge branch 'main' into main

This commit is contained in:
Sebastián Ramírez 2022-12-17 00:52:07 +04:00 committed by GitHub
commit 54d1816a9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 3 deletions

View File

@ -68,7 +68,7 @@ jobs:
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3
with: with:
name: docs-zip name: docs-zip
path: ./docs.zip path: ./site/docs.zip
- name: Deploy to Netlify - name: Deploy to Netlify
uses: nwtgck/actions-netlify@v1.1.5 uses: nwtgck/actions-netlify@v1.1.5
with: with:

View File

@ -11,6 +11,10 @@ jobs:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v3.1.0 - uses: actions/checkout@v3.1.0
- name: Clean site
run: |
rm -rf ./site
mkdir ./site
- name: Download Artifact Docs - name: Download Artifact Docs
uses: dawidd6/action-download-artifact@v2.24.2 uses: dawidd6/action-download-artifact@v2.24.2
with: with:
@ -18,9 +22,10 @@ jobs:
workflow: build-docs.yml workflow: build-docs.yml
run_id: ${{ github.event.workflow_run.id }} run_id: ${{ github.event.workflow_run.id }}
name: docs-zip name: docs-zip
path: ./site/
- name: Unzip docs - name: Unzip docs
run: | run: |
rm -rf ./site cd ./site
unzip docs.zip unzip docs.zip
rm -f docs.zip rm -f docs.zip
- name: Deploy to Netlify - name: Deploy to Netlify

View File

@ -2,6 +2,7 @@
## Latest Changes ## Latest Changes
* 👷 Refactor CI artifact upload/download for docs previews. PR [#514](https://github.com/tiangolo/sqlmodel/pull/514) by [@tiangolo](https://github.com/tiangolo).
* ✏️ Fix typo in internal function name `get_sqlachemy_type()`. PR [#496](https://github.com/tiangolo/sqlmodel/pull/496) by [@cmarqu](https://github.com/cmarqu). * ✏️ Fix typo in internal function name `get_sqlachemy_type()`. PR [#496](https://github.com/tiangolo/sqlmodel/pull/496) by [@cmarqu](https://github.com/cmarqu).
* ⬆ Bump actions/cache from 2 to 3. PR [#497](https://github.com/tiangolo/sqlmodel/pull/497) by [@dependabot[bot]](https://github.com/apps/dependabot). * ⬆ Bump actions/cache from 2 to 3. PR [#497](https://github.com/tiangolo/sqlmodel/pull/497) by [@dependabot[bot]](https://github.com/apps/dependabot).
* ✏️ Fix typo in docs. PR [#446](https://github.com/tiangolo/sqlmodel/pull/446) by [@davidbrochart](https://github.com/davidbrochart). * ✏️ Fix typo in docs. PR [#446](https://github.com/tiangolo/sqlmodel/pull/446) by [@davidbrochart](https://github.com/davidbrochart).

View File

@ -3,7 +3,9 @@
set -x set -x
set -e set -e
cd ./site
if [ -f docs.zip ]; then if [ -f docs.zip ]; then
rm -rf docs.zip rm -rf docs.zip
fi fi
zip -r docs.zip ./site zip -r docs.zip ./