Skip to content

Commit 21d9ba2

Browse files
authored
Merge pull request #3168 from hhunter-ms/endgame_v1.10_prep
[Endgame] Prep v1.10 branch for release
2 parents 0d3d614 + 7933f8b commit 21d9ba2

File tree

5 files changed

+16
-11
lines changed

5 files changed

+16
-11
lines changed

.github/workflows/website-root.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: Azure Static Web App Root
33
on:
44
push:
55
branches:
6-
- v1.9
6+
- v1.10
77
pull_request:
88
types: [opened, synchronize, reopened, closed]
99
branches:
10-
- v1.9
10+
- v1.10
1111

1212
jobs:
1313
build_and_deploy_job:

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ The following branches are currently maintained:
1414

1515
| Branch | Website | Description |
1616
| ------------------------------------------------------------ | -------------------------- | ------------------------------------------------------------------------------------------------ |
17-
| [v1.9](https://github.com/dapr/docs) (primary) | https://docs.dapr.io | Latest Dapr release documentation. Typo fixes, clarifications, and most documentation goes here. |
18-
| [v1.10](https://github.com/dapr/docs/tree/v1.10) (pre-release) | https://v1-10.docs.dapr.io/ | Pre-release documentation. Doc updates that are only applicable to v1.10+ go here. |
17+
| [v1.10](https://github.com/dapr/docs) (primary) | https://docs.dapr.io | Latest Dapr release documentation. Typo fixes, clarifications, and most documentation goes here. |
18+
| [v1.11](https://github.com/dapr/docs/tree/v1.11) (pre-release) | https://v1-11.docs.dapr.io/ | Pre-release documentation. Doc updates that are only applicable to v1.11+ go here. |
1919

2020
For more information visit the [Dapr branch structure](https://docs.dapr.io/contributing/docs-contrib/contributing-docs/#branch-guidance) document.
2121

daprdocs/config.toml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Site Configuration
2-
baseURL = "https://v1-10.docs.dapr.io"
2+
baseURL = "https://docs.dapr.io"
33
title = "Dapr Docs"
44
theme = "docsy"
55
disableFastRender = true
@@ -167,17 +167,20 @@ github_subdir = "daprdocs"
167167
github_branch = "v1.10"
168168

169169
# Versioning
170-
version_menu = "v1.10 (preview)"
170+
version_menu = "v1.10 (latest)"
171171
version = "v1.10"
172172
archived_version = false
173173
url_latest_version = "https://docs.dapr.io"
174174

175175
[[params.versions]]
176-
version = "v1.10 (preview)"
176+
version = "v1.11 (preview)"
177+
url = "https://v1-11.docs.dapr.io"
178+
[[params.versions]]
179+
version = "v1.10 (latest)"
177180
url = "#"
178181
[[params.versions]]
179-
version = "v1.9 (latest)"
180-
url = "https://docs.dapr.io"
182+
version = "v1.9"
183+
url = "https://v1-9.docs.dapr.io"
181184
[[params.versions]]
182185
version = "v1.8"
183186
url = "https://v1-8.docs.dapr.io"

daprdocs/content/en/operations/support/support-release-policy.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ The table below shows the versions of Dapr releases that have been tested togeth
3434

3535
| Release date | Runtime | CLI | SDKs | Dashboard | Status |
3636
|--------------------|:--------:|:--------|---------|---------|---------|
37-
| December 2nd 2022 | 1.9.5</br> | 1.9.1 | Java 1.7.0 </br>Go 1.6.0 </br>PHP 1.1.0 </br>Python 1.8.3 </br>.NET 1.9.0 </br>JS 2.4.2 | 0.11.0 | Supported (current) |
37+
| February 14 2023 | 1.10.0</br> | 1.10.0 | Java 1.8.0 </br>Go 1.6.0 </br>PHP 1.1.0 </br>Python 1.9.0 </br>.NET 1.10.0 </br>JS 2.5.0 | 0.11.0 | Supported (current) |
38+
| December 2nd 2022 | 1.9.5</br> | 1.9.1 | Java 1.7.0 </br>Go 1.6.0 </br>PHP 1.1.0 </br>Python 1.8.3 </br>.NET 1.9.0 </br>JS 2.4.2 | 0.11.0 | Supported |
3839
| November 17th 2022 | 1.9.4</br> | 1.9.1 | Java 1.7.0 </br>Go 1.6.0 </br>PHP 1.1.0 </br>Python 1.8.3 </br>.NET 1.9.0 </br>JS 2.4.2 | 0.11.0 | Supported |
3940
| November 4th 2022 | 1.9.3</br> | 1.9.1 | Java 1.7.0 </br>Go 1.6.0 </br>PHP 1.1.0 </br>Python 1.8.3 </br>.NET 1.9.0 </br>JS 2.4.2 | 0.11.0 | Supported |
4041
| November 1st 2022 | 1.9.2</br> | 1.9.1 | Java 1.7.0 </br>Go 1.6.0 </br>PHP 1.1.0 </br>Python 1.8.1 </br>.NET 1.9.0 </br>JS 2.4.2 | 0.11.0 | Supported |
@@ -89,6 +90,7 @@ General guidance on upgrading can be found for [self hosted mode]({{< ref self-h
8990
| | 1.8.6 | 1.9.5 |
9091
| 1.8.0 to 1.8.6 | N/A | 1.9.5 |
9192
| 1.9.0 | N/A | 1.9.5 |
93+
| 1.10.0 | N/A | 1.10.0 |
9294

9395
## Breaking changes and deprecations
9496

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{{- if .Get "short" }}1.9{{ else if .Get "long" }}1.9.5{{ else if .Get "cli" }}1.9.0{{ else }}1.9.5{{ end -}}
1+
{{- if .Get "short" }}1.10{{ else if .Get "long" }}1.10.0{{ else if .Get "cli" }}1.10.0{{ else }}1.9.5{{ end -}}

0 commit comments

Comments
 (0)