Merge pull request #4467 from hhunter-ms/endgame_v1.14-updates

[Endgame] Prep v1.14 branch for v1.15 release

.github/workflows/website-root.yml

@@ -1,109 +0,0 @@
-name: Azure Static Web App Root
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - v1.14
-  pull_request:
-    types: [opened, synchronize, reopened, closed]
-    branches:
-      - v1.14
-
-concurrency:
-  # Cancel the previously triggered build for only PR build.
-  group: website-${{ github.event.pull_request.number || github.sha }}
-  cancel-in-progress: true
-
-jobs:
-  build_and_deploy_job:
-    name: Build Hugo Website
-    if: github.event.action != 'closed'
-    runs-on: ubuntu-latest
-    env:
-      SWA_BASE: 'proud-bay-0e9e0e81e'
-      HUGO_ENV: production
-    steps:
-      - name: Checkout docs repo
-        uses: actions/checkout@v3
-        with:
-          submodules: true
-      - name: Setup Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: '14'
-      - name: Setup Hugo
-        uses: peaceiris/actions-hugo@v2.5.0
-        with:
-          hugo-version: 0.102.3
-          extended: true
-      - 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 Hugo Website
-        run: |
-          cd daprdocs
-          git config --global --add safe.directory /github/workspace
-          if [ $GITHUB_EVENT_NAME == 'pull_request' ]; then
-            STAGING_URL="https://${SWA_BASE}-${{github.event.number}}.westus2.azurestaticapps.net/"
-          fi
-          hugo ${STAGING_URL+-b "$STAGING_URL"}
-      - name: Deploy docs site
-        uses: Azure/static-web-apps-deploy@v1
-        with:
-          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PROUD_BAY_0E9E0E81E }}
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          action: "upload"
-          app_location: "daprdocs/public/"
-          api_location: "daprdocs/public/" 
-          output_location: ""
-          skip_app_build: true
-          skip_deploy_on_missing_secrets: true
-      - name: Upload Hugo artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: hugo_build
-          path: ./daprdocs/public/
-          if-no-files-found: error
-
-  close_staging_site:
-    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@v1
-        with:
-          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PROUD_BAY_0E9E0E81E }}
-          action: "close"
-          skip_deploy_on_missing_secrets: true
-
-  algolia_index:
-    name: Index site for Algolia
-    if: github.event_name == 'push'
-    needs: ['build_and_deploy_job']
-    runs-on: ubuntu-latest
-    env:
-      ALGOLIA_APP_ID: ${{ secrets.ALGOLIA_APP_ID }}
-      ALGOLIA_API_WRITE_KEY: ${{ secrets.ALGOLIA_API_WRITE_KEY }}
-      ALGOLIA_INDEX_NAME: daprdocs
-    steps:
-      - name: Checkout docs repo
-        uses: actions/checkout@v2
-        with:
-          submodules: false
-      - name: Download Hugo artifacts
-        uses: actions/download-artifact@v4.1.7
-        with:
-          name: hugo_build
-          path: site/
-      - name: Install Python packages
-        run: |
-          pip install --upgrade bs4
-          pip install --upgrade 'algoliasearch>=2.0,<3.0'
-      - name: Index site
-        run: python ./.github/scripts/algolia.py ./site

README.md

@@ -16,8 +16,8 @@ The following branches are currently maintained:
 
 | Branch                                                       | Website                    | Description                                                                                      |
 | ------------------------------------------------------------ | -------------------------- | ------------------------------------------------------------------------------------------------ |
-| [v1.14](https://github.com/dapr/docs) (primary)               | https://docs.dapr.io       | Latest Dapr release documentation. Typo fixes, clarifications, and most documentation goes here. |
+| [v1.15](https://github.com/dapr/docs) (primary)               | https://docs.dapr.io       | Latest Dapr release documentation. Typo fixes, clarifications, and most documentation goes here. |
-| [v1.15](https://github.com/dapr/docs/tree/v1.15) (pre-release) | https://v1-15.docs.dapr.io/ | Pre-release documentation. Doc updates that are only applicable to v1.15+ go here.                |
+| [v1.16](https://github.com/dapr/docs/tree/v1.16) (pre-release) | https://v1-16.docs.dapr.io/ | Pre-release documentation. Doc updates that are only applicable to v1.16+ go here.                |
 
 For more information visit the [Dapr branch structure](https://docs.dapr.io/contributing/docs-contrib/contributing-docs/#branch-guidance) document.
 

daprdocs/config.toml

@@ -1,5 +1,5 @@
 # Site Configuration
-baseURL = "https://docs.dapr.io"
+baseURL = "https://v1-14.docs.dapr.io"
 title = "Dapr Docs"
 theme = "docsy"
 disableFastRender = true
@@ -199,17 +199,20 @@ github_subdir = "daprdocs"
 github_branch = "v1.14"
 
 # Versioning
-version_menu = "v1.14 (latest)"
+version_menu = "v1.14"
 version = "v1.14"
-archived_version = false
+archived_version = true
 url_latest_version = "https://docs.dapr.io"
 
 [[params.versions]]
-  version = "v1.15 (preview)"
+  version = "v1.16 (preview)"
-  url = "https://v1-15.docs.dapr.io"
+  url = "https://v1-16.docs.dapr.io"
 [[params.versions]]
-  version = "v1.14 (latest)"
+  version = "v1.15 (latest)"
   url = "https://docs.dapr.io"
+[[params.versions]]
+  version = "v1.14"
+  url = "https://v1-14.docs.dapr.io"
 [[params.versions]]
   version = "v1.13"
   url = "https://v1-13.docs.dapr.io"