Merge pull request #1914 from willtsai/v1.6

create new v1.6 branch and config for v1.6 website
This commit is contained in:
greenie-msft 2021-11-05 16:01:23 -07:00 committed by GitHub
commit cbaf46b2f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 11 deletions

View File

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

View File

@ -1,5 +1,5 @@
# Site Configuration # Site Configuration
baseURL = "https://v1-5.docs.dapr.io/" baseURL = "https://v1-6.docs.dapr.io/"
title = "Dapr Docs" title = "Dapr Docs"
theme = "docsy" theme = "docsy"
disableFastRender = true disableFastRender = true
@ -157,20 +157,23 @@ offlineSearch = false
github_repo = "https://github.com/dapr/docs" github_repo = "https://github.com/dapr/docs"
github_project_repo = "https://github.com/dapr/dapr" github_project_repo = "https://github.com/dapr/dapr"
github_subdir = "daprdocs" github_subdir = "daprdocs"
github_branch = "v1.5" github_branch = "v1.6"
# Versioning # Versioning
version_menu = "v1.5 (preview)" version_menu = "v1.6 (preview)"
version = "v1.5" version = "v1.6"
archived_version = false archived_version = false
url_latest_version = "https://docs.dapr.io" url_latest_version = "https://docs.dapr.io"
[[params.versions]] [[params.versions]]
version = "v1.5 (preview)" version = "v1.6 (preview)"
url = "#" url = "#"
[[params.versions]] [[params.versions]]
version = "v1.4 (latest)" version = "v1.5 (latest)"
url = "https://docs.dapr.io" url = "https://docs.dapr.io"
[[params.versions]]
version = "v1.4"
url = "https://v1-4.docs.dapr.io"
[[params.versions]] [[params.versions]]
version = "v1.3" version = "v1.3"
url = "https://v1-3.docs.dapr.io" url = "https://v1-3.docs.dapr.io"