From 0aa13e6e8e975c937704f628ab4e563778e15aa5 Mon Sep 17 00:00:00 2001
From: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com>
Date: Thu, 7 Apr 2022 19:23:40 -0500
Subject: [PATCH] update to 1.6 for 1.7 release (#2345)

Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>

Co-authored-by: Mark Fussell <markfussell@gmail.com>
---
 .github/workflows/website-root.yml | 53 ------------------------------
 README.md                          |  4 +--
 daprdocs/config.toml               | 15 +++++----
 3 files changed, 11 insertions(+), 61 deletions(-)
 delete mode 100644 .github/workflows/website-root.yml

diff --git a/.github/workflows/website-root.yml b/.github/workflows/website-root.yml
deleted file mode 100644
index ed487f50a..000000000
--- a/.github/workflows/website-root.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-name: Azure Static Web App Root
-
-on:
-  push:
-    branches:
-      - v1.6
-  pull_request:
-    types: [opened, synchronize, reopened, closed]
-    branches:
-      - v1.6
-
-jobs:
-  build_and_deploy_job:
-    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
-    runs-on: ubuntu-latest
-    name: Build and Deploy Job
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: recursive
-      - name: Setup Docsy
-        run: cd daprdocs && git submodule update --init --recursive && sudo npm install -D --save autoprefixer && sudo npm install -D --save postcss-cli
-      - name: Build And Deploy
-        id: builddeploy
-        uses: Azure/static-web-apps-deploy@v0.0.1-preview
-        env:
-          HUGO_ENV: production
-          HUGO_VERSION: "0.74.3"
-        with:
-          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PROUD_BAY_0E9E0E81E }}
-          repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
-          skip_deploy_on_missing_secrets: true
-          action: "upload"
-          ###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
-          # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
-          app_location: "/daprdocs" # App source code path
-          api_location: "api" # Api source code path - optional
-          output_location: "public" # Built app content directory - optional
-          app_build_command: "hugo"
-          ###### End of Repository/Build Configurations ######
-
-  close_pull_request_job:
-    if: github.event_name == 'pull_request' && github.event.action == 'closed'
-    runs-on: ubuntu-latest
-    name: Close Pull Request Job
-    steps:
-      - name: Close Pull Request
-        id: closepullrequest
-        uses: Azure/static-web-apps-deploy@v0.0.1-preview
-        with:
-          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PROUD_BAY_0E9E0E81E }}
-          skip_deploy_on_missing_secrets: true
-          action: "close"
\ No newline at end of file
diff --git a/README.md b/README.md
index 70a711021..96cfeb173 100644
--- a/README.md
+++ b/README.md
@@ -14,8 +14,8 @@ The following branches are currently maintained:
 
 | Branch                                                       | Website                    | Description                                                                                      |
 | ------------------------------------------------------------ | -------------------------- | ------------------------------------------------------------------------------------------------ |
-| [v1.6](https://github.com/dapr/docs) (primary)               | https://docs.dapr.io       | Latest Dapr release documentation. Typo fixes, clarifications, and most documentation goes here. |
-| [v1.7](https://github.com/dapr/docs/tree/v1.7) (pre-release) | https://v1-7.docs.dapr.io/ | Pre-release documentation. Doc updates that are only applicable to v1.7+ go here.                |
+| [v1.7](https://github.com/dapr/docs) (primary)               | https://docs.dapr.io       | Latest Dapr release documentation. Typo fixes, clarifications, and most documentation goes here. |
+| [v1.8](https://github.com/dapr/docs/tree/v1.8) (pre-release) | https://v1-8.docs.dapr.io/ | Pre-release documentation. Doc updates that are only applicable to v1.8+ go here.                |
 
 For more information visit the [Dapr branch structure](https://docs.dapr.io/contributing/contributing-docs/#branch-guidance) document.
 
diff --git a/daprdocs/config.toml b/daprdocs/config.toml
index 2e0af0ea6..e6fabdd59 100644
--- a/daprdocs/config.toml
+++ b/daprdocs/config.toml
@@ -1,5 +1,5 @@
 # Site Configuration
-baseURL = "https://docs.dapr.io/"
+baseURL = "https://v1-6.docs.dapr.io/"
 title = "Dapr Docs"
 theme = "docsy"
 disableFastRender = true
@@ -163,17 +163,20 @@ github_subdir = "daprdocs"
 github_branch = "v1.6"
 
 # Versioning
-version_menu = "v1.6 (latest)"
+version_menu = "v1.6"
 version = "v1.6"
-archived_version = false
+archived_version = true
 url_latest_version = "https://docs.dapr.io"
 
 [[params.versions]]
-  version = "v1.7 (preview)"
-  url = "https://v1-7.docs.dapr.io"
+  version = "v1.8 (preview)"
+  url = "https://v1-8.docs.dapr.io"
 [[params.versions]]
-  version = "v1.6 (latest)"
+  version = "v1.7 (latest)"
   url = "#"
+[[params.versions]]
+  version = "v1.6"
+  url = "https://v1-6.docs.dapr.io"
 [[params.versions]]
   version = "v1.5"
   url = "https://v1-5.docs.dapr.io"