Merge branch 'v1.13' into upmerge2_10-11

Signed-off-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com>
This commit is contained in:
Hannah Hunter 2023-10-12 11:34:34 -04:00 committed by GitHub
commit 5fc8039aea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 10 deletions

View File

@ -1,13 +1,13 @@
name: Azure Static Web App v1.12
name: Azure Static Web App v1.13
on:
push:
branches:
- v1.12
- v1.13
pull_request:
types: [opened, synchronize, reopened, closed]
branches:
- v1.12
- v1.13
jobs:
build_and_deploy_job:
@ -28,7 +28,7 @@ jobs:
HUGO_ENV: production
HUGO_VERSION: "0.100.2"
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_V1_12 }}
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_V1_13 }}
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
skip_deploy_on_missing_secrets: true
action: "upload"
@ -49,6 +49,6 @@ jobs:
id: closepullrequest
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_V1_12 }}
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_V1_13 }}
skip_deploy_on_missing_secrets: true
action: "close"

View File

@ -1,5 +1,5 @@
# Site Configuration
baseURL = "https://docs.dapr.io"
baseURL = "https://v1-13.docs.dapr.io"
title = "Dapr Docs"
theme = "docsy"
disableFastRender = true
@ -168,11 +168,11 @@ offlineSearch = false
github_repo = "https://github.com/dapr/docs"
github_project_repo = "https://github.com/dapr/dapr"
github_subdir = "daprdocs"
github_branch = "v1.12"
github_branch = "v1.13"
# Versioning
version_menu = "v1.12 (latest)"
version = "v1.12"
version_menu = "v1.13 (preview)"
version = "v1.13"
archived_version = false
url_latest_version = "https://docs.dapr.io"
@ -181,7 +181,10 @@ url_latest_version = "https://docs.dapr.io"
url = "https://v1-13.docs.dapr.io"
[[params.versions]]
version = "v1.12 (latest)"
url = "https://docs.dapr.io"
url = "#"
[[params.versions]]
version = "v1.11"
url = "https://v1-11.docs.dapr.io"
[[params.versions]]
version = "v1.11"
url = "https://v1-11.docs.dapr.io"