Skip to content

Commit 40b8199

Browse files
authored
Merge branch 'v1.16' into upmerge_12-18
2 parents 33eb35f + 942c881 commit 40b8199

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

.github/workflows/website-v1-15.yml .github/workflows/website-v1-16.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
name: Azure Static Web App v1.15
1+
name: Azure Static Web App v1.16
22

33
on:
44
workflow_dispatch:
55
push:
66
branches:
7-
- v1.15
7+
- v1.16
88
pull_request:
99
types: [opened, synchronize, reopened, closed]
1010
branches:
11-
- v1.15
11+
- v1.16
1212

1313
jobs:
1414
build_and_deploy_job:
@@ -29,7 +29,7 @@ jobs:
2929
HUGO_ENV: production
3030
HUGO_VERSION: "0.100.2"
3131
with:
32-
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_V1_15 }}
32+
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_V1_16 }}
3333
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
3434
skip_deploy_on_missing_secrets: true
3535
action: "upload"
@@ -50,6 +50,6 @@ jobs:
5050
id: closepullrequest
5151
uses: Azure/static-web-apps-deploy@v1
5252
with:
53-
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_V1_15 }}
53+
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_V1_16 }}
5454
skip_deploy_on_missing_secrets: true
5555
action: "close"

daprdocs/config.toml

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Site Configuration
2-
baseURL = "https://v1-15.docs.dapr.io"
2+
baseURL = "https://v1-16.docs.dapr.io"
33
title = "Dapr Docs"
44
theme = "docsy"
55
disableFastRender = true
@@ -196,20 +196,23 @@ offlineSearch = false
196196
github_repo = "https://github.com/dapr/docs"
197197
github_project_repo = "https://github.com/dapr/dapr"
198198
github_subdir = "daprdocs"
199-
github_branch = "v1.15"
199+
github_branch = "v1.16"
200200

201201
# Versioning
202-
version_menu = "v1.15 (preview)"
203-
version = "v1.15"
202+
version_menu = "v1.16 (preview)"
203+
version = "v1.16"
204204
archived_version = false
205205
url_latest_version = "https://docs.dapr.io"
206206

207207
[[params.versions]]
208-
version = "v1.15 (preview)"
208+
version = "v1.16 (preview)"
209209
url = "#"
210210
[[params.versions]]
211-
version = "v1.14 (latest)"
211+
version = "v1.15 (latest)"
212212
url = "https://docs.dapr.io"
213+
[[params.versions]]
214+
version = "v1.14"
215+
url = "https://v1-14.docs.dapr.io"
213216
[[params.versions]]
214217
version = "v1.13"
215218
url = "https://v1-13.docs.dapr.io"

0 commit comments

Comments
 (0)