From d5b58dff12e84413dc99ac2b09c11cf278d35b92 Mon Sep 17 00:00:00 2001 From: Hannah Hunter Date: Mon, 13 Feb 2023 10:36:12 -0600 Subject: [PATCH 1/2] endgame prep for v1.10 branch Signed-off-by: Hannah Hunter --- .github/workflows/website-root.yml | 4 ++-- README.md | 4 ++-- daprdocs/config.toml | 13 ++++++++----- .../en/operations/support/support-release-policy.md | 4 +++- .../layouts/shortcodes/dapr-latest-version.html | 2 +- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.github/workflows/website-root.yml b/.github/workflows/website-root.yml index 16c5874d412..febd860b143 100644 --- a/.github/workflows/website-root.yml +++ b/.github/workflows/website-root.yml @@ -3,11 +3,11 @@ name: Azure Static Web App Root on: push: branches: - - v1.9 + - v1.10 pull_request: types: [opened, synchronize, reopened, closed] branches: - - v1.9 + - v1.10 jobs: build_and_deploy_job: diff --git a/README.md b/README.md index 4a9e9b7e145..2dd61a89ea9 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,8 @@ The following branches are currently maintained: | Branch | Website | Description | | ------------------------------------------------------------ | -------------------------- | ------------------------------------------------------------------------------------------------ | -| [v1.9](https://github.com/dapr/docs) (primary) | https://docs.dapr.io | Latest Dapr release documentation. Typo fixes, clarifications, and most documentation goes here. | -| [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. | +| [v1.10](https://github.com/dapr/docs) (primary) | https://docs.dapr.io | Latest Dapr release documentation. Typo fixes, clarifications, and most documentation goes here. | +| [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. | For more information visit the [Dapr branch structure](https://docs.dapr.io/contributing/docs-contrib/contributing-docs/#branch-guidance) document. diff --git a/daprdocs/config.toml b/daprdocs/config.toml index 9e2523a6f91..f6ece7e8430 100644 --- a/daprdocs/config.toml +++ b/daprdocs/config.toml @@ -1,5 +1,5 @@ # Site Configuration -baseURL = "https://v1-10.docs.dapr.io" +baseURL = "https://docs.dapr.io" title = "Dapr Docs" theme = "docsy" disableFastRender = true @@ -163,17 +163,20 @@ github_subdir = "daprdocs" github_branch = "v1.10" # Versioning -version_menu = "v1.10 (preview)" +version_menu = "v1.10 (latest)" version = "v1.10" archived_version = false url_latest_version = "https://docs.dapr.io" [[params.versions]] - version = "v1.10 (preview)" + version = "v1.11 (preview)" + url = "https://v1-11.docs.dapr.io" +[[params.versions]] + version = "v1.10 (latest)" url = "#" [[params.versions]] - version = "v1.9 (latest)" - url = "https://docs.dapr.io" + version = "v1.9" + url = "https://v1-9.docs.dapr.io" [[params.versions]] version = "v1.8" url = "https://v1-8.docs.dapr.io" diff --git a/daprdocs/content/en/operations/support/support-release-policy.md b/daprdocs/content/en/operations/support/support-release-policy.md index d83034d584b..9c2c366d7b7 100644 --- a/daprdocs/content/en/operations/support/support-release-policy.md +++ b/daprdocs/content/en/operations/support/support-release-policy.md @@ -34,7 +34,8 @@ The table below shows the versions of Dapr releases that have been tested togeth | Release date | Runtime | CLI | SDKs | Dashboard | Status | |--------------------|:--------:|:--------|---------|---------|---------| -| December 2nd 2022 | 1.9.5
| 1.9.1 | Java 1.7.0
Go 1.6.0
PHP 1.1.0
Python 1.8.3
.NET 1.9.0
JS 2.4.2 | 0.11.0 | Supported (current) | +| February 14 2023 | 1.10.0
| 1.10.0 | Java 1.7.0
Go 1.6.0
PHP 1.1.0
Python 1.8.3
.NET 1.9.0
JS 2.4.2 | 0.11.0 | Supported (current) | +| December 2nd 2022 | 1.9.5
| 1.9.1 | Java 1.7.0
Go 1.6.0
PHP 1.1.0
Python 1.8.3
.NET 1.9.0
JS 2.4.2 | 0.11.0 | Supported | | November 17th 2022 | 1.9.4
| 1.9.1 | Java 1.7.0
Go 1.6.0
PHP 1.1.0
Python 1.8.3
.NET 1.9.0
JS 2.4.2 | 0.11.0 | Supported | | November 4th 2022 | 1.9.3
| 1.9.1 | Java 1.7.0
Go 1.6.0
PHP 1.1.0
Python 1.8.3
.NET 1.9.0
JS 2.4.2 | 0.11.0 | Supported | | November 1st 2022 | 1.9.2
| 1.9.1 | Java 1.7.0
Go 1.6.0
PHP 1.1.0
Python 1.8.1
.NET 1.9.0
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 | | 1.8.6 | 1.9.5 | | 1.8.0 to 1.8.6 | N/A | 1.9.5 | | 1.9.0 | N/A | 1.9.5 | +| 1.10.0 | N/A | 1.10.0 | ## Breaking changes and deprecations diff --git a/daprdocs/layouts/shortcodes/dapr-latest-version.html b/daprdocs/layouts/shortcodes/dapr-latest-version.html index df0cb50bef1..1ac5196d05c 100644 --- a/daprdocs/layouts/shortcodes/dapr-latest-version.html +++ b/daprdocs/layouts/shortcodes/dapr-latest-version.html @@ -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 -}} +{{- if .Get "short" }}1.10{{ else if .Get "long" }}1.10.0{{ else if .Get "cli" }}1.10.0{{ else }}1.9.5{{ end -}} From 7933f8b874a580f6ca92d545fd6f473d02f0cdd7 Mon Sep 17 00:00:00 2001 From: Hannah Hunter Date: Tue, 14 Feb 2023 09:26:25 -0600 Subject: [PATCH 2/2] update sdk versions Signed-off-by: Hannah Hunter --- .../content/en/operations/support/support-release-policy.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daprdocs/content/en/operations/support/support-release-policy.md b/daprdocs/content/en/operations/support/support-release-policy.md index 9c2c366d7b7..77112dce05e 100644 --- a/daprdocs/content/en/operations/support/support-release-policy.md +++ b/daprdocs/content/en/operations/support/support-release-policy.md @@ -34,7 +34,7 @@ The table below shows the versions of Dapr releases that have been tested togeth | Release date | Runtime | CLI | SDKs | Dashboard | Status | |--------------------|:--------:|:--------|---------|---------|---------| -| February 14 2023 | 1.10.0
| 1.10.0 | Java 1.7.0
Go 1.6.0
PHP 1.1.0
Python 1.8.3
.NET 1.9.0
JS 2.4.2 | 0.11.0 | Supported (current) | +| February 14 2023 | 1.10.0
| 1.10.0 | Java 1.8.0
Go 1.6.0
PHP 1.1.0
Python 1.9.0
.NET 1.10.0
JS 2.5.0 | 0.11.0 | Supported (current) | | December 2nd 2022 | 1.9.5
| 1.9.1 | Java 1.7.0
Go 1.6.0
PHP 1.1.0
Python 1.8.3
.NET 1.9.0
JS 2.4.2 | 0.11.0 | Supported | | November 17th 2022 | 1.9.4
| 1.9.1 | Java 1.7.0
Go 1.6.0
PHP 1.1.0
Python 1.8.3
.NET 1.9.0
JS 2.4.2 | 0.11.0 | Supported | | November 4th 2022 | 1.9.3
| 1.9.1 | Java 1.7.0
Go 1.6.0
PHP 1.1.0
Python 1.8.3
.NET 1.9.0
JS 2.4.2 | 0.11.0 | Supported |