Update to 1.2 (#1519)

dapr · May 27, 2021 · 5d71c50 · 5d71c50
1 parent aedc209
commit 5d71c50
Show file tree

Hide file tree

Showing 8 changed files with 123 additions and 123 deletions.
diff --git a/...tatic-web-apps-yellow-river-084fe4e1e.yml → .github/workflows/website-root.yml b/...tatic-web-apps-yellow-river-084fe4e1e.yml → .github/workflows/website-root.yml
@@ -1,53 +1,53 @@
-name: Azure Static Web Apps CI/CD
-
-on:
-  push:
-    branches:
-      - v1.1
-  pull_request:
-    types: [opened, synchronize, reopened, closed]
-    branches:
-      - v1.1
-
-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_YELLOW_RIVER_084FE4E1E }}
-          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 you 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_YELLOW_RIVER_084FE4E1E }}
-          skip_deploy_on_missing_secrets: true
-          action: "close"
+name: Azure Static Web App Root
+
+on:
+  push:
+    branches:
+      - v1.2
+  pull_request:
+    types: [opened, synchronize, reopened, closed]
+    branches:
+      - v1.2
+
+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"
diff --git a/...c-web-apps-wonderful-island-07c05fd1e.yml → .github/workflows/website-v1-2.yml b/...c-web-apps-wonderful-island-07c05fd1e.yml → .github/workflows/website-v1-2.yml
@@ -1,53 +1,53 @@
-name: Azure Static Web Apps CI/CD
-
-on:
-  push:
-    branches:
-      - v1.2
-  pull_request:
-    types: [opened, synchronize, reopened, closed]
-    branches:
-      - v1.2
-
-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_WONDERFUL_ISLAND_07C05FD1E }}
-          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_WONDERFUL_ISLAND_07C05FD1E }}
-          skip_deploy_on_missing_secrets: true
-          action: "close"
+name: Azure Static Web App v1.2
+
+on:
+  push:
+    branches:
+      - v1.2
+  pull_request:
+    types: [opened, synchronize, reopened, closed]
+    branches:
+      - v1.2
+
+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_WONDERFUL_ISLAND_07C05FD1E }}
+          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_WONDERFUL_ISLAND_07C05FD1E }}
+          skip_deploy_on_missing_secrets: true
+          action: "close"
diff --git a/README.md b/README.md
@@ -14,8 +14,8 @@ The following branches are currently maintained:
 
 | Branch | Website | Description |
 |--------|---------|-------------|
-| [v1.1](https://github.com/dapr/docs) (primary) | https://docs.dapr.io | Latest Dapr release documentation. Typo fixes, clarifications, and most documentation goes here.
-| [v1.2](https://github.com/dapr/docs/tree/v1.2) (pre-release) | https://v1-2.docs.dapr.io/ | Pre-release documentation. Doc updates that are only applicable to v1.2+ go here.
+| [v1.2](https://github.com/dapr/docs) (primary) | https://docs.dapr.io | Latest Dapr release documentation. Typo fixes, clarifications, and most documentation goes here.
+| [v1.3](https://github.com/dapr/docs/tree/v1.3) (pre-release) | https://v1-3.docs.dapr.io/ | Pre-release documentation. Doc updates that are only applicable to v1.3+ go here.
 
 For more information visit the [Dapr branch structure](https://docs.dapr.io/contributing/contributing-docs/#branch-guidance) document.
 
@@ -58,7 +58,7 @@ npm install
 1. Make sure you're still in the `daprdocs` directory
 2. Run
 ```sh
-hugo server --disableFastRender
+hugo server
 ```
 3. Navigate to `http://localhost:1313/`
 

diff --git a/daprdocs/config.toml b/daprdocs/config.toml
@@ -1,5 +1,5 @@
 # Site Configuration
-baseURL = "https://v1-2.docs.dapr.io/"
+baseURL = "https://docs.dapr.io/"
 title = "Dapr Docs"
 theme = "docsy"
 disableFastRender = true
@@ -136,17 +136,17 @@ github_subdir = "daprdocs"
 github_branch = "v1.2"
 
 # Versioning
-version_menu = "v1.2 (preview)"
+version_menu = "v1.2 (latest)"
 version = "v1.2"
 archived_version = false
 url_latest_version = "https://docs.dapr.io"
 
 [[params.versions]]
-  version = "v1.2 (preview)"
+  version = "v1.2 (latest)"
   url = "#"
 [[params.versions]]
-  version = "v1.1 (latest)"
-  url = "https://docs.dapr.io"
+  version = "v1.1"
+  url = "https://v1-1.docs.dapr.io"
 [[params.versions]]
   version = "v1.0"
   url = "https://v1-0.docs.dapr.io"

diff --git a/daprdocs/content/en/getting-started/install-dapr-selfhost.md b/daprdocs/content/en/getting-started/install-dapr-selfhost.md
@@ -52,8 +52,8 @@ dapr --version
 
 Output should look like this:
 ```
-CLI version: 1.1.0
-Runtime version: 1.1.2
+CLI version: 1.2.0
+Runtime version: 1.2.0
 ```
 
 ### Step 4: Verify containers are running

diff --git a/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-deploy.md b/daprdocs/content/en/operations/hosting/kubernetes/kubernetes-deploy.md
@@ -122,7 +122,7 @@ The latest Dapr helm chart no longer supports Helm v2. Please migrate from Helm
 
     ```bash
     helm upgrade --install dapr dapr/dapr \
-    --version=1.1.2 \
+    --version=1.2 \
     --namespace dapr-system \
     --create-namespace \
     --wait
@@ -132,7 +132,7 @@ The latest Dapr helm chart no longer supports Helm v2. Please migrate from Helm
 
     ```bash
     helm upgrade --install dapr dapr/dapr \
-    --version=1.1.2 \
+    --version=1.2 \
     --namespace dapr-system \
     --create-namespace \
     --set global.ha.enabled=true \

diff --git a/daprdocs/content/en/operations/hosting/self-hosted/self-hosted-upgrade.md b/daprdocs/content/en/operations/hosting/self-hosted/self-hosted-upgrade.md
@@ -25,11 +25,11 @@ description: "Follow these steps to upgrade Dapr in self-hosted mode and ensure
    dapr init
    ```
 
-1. Ensure you are using the latest version of Dapr (v1.1.2) with:
+1. Ensure you are using the latest version of Dapr (v1.2) with:
 
    ```bash
    $ dapr --version
 
-   CLI version: 1.1.0
-   Runtime version: 1.1.2
+   CLI version: 1.2
+   Runtime version: 1.2
    ```
diff --git a/daprdocs/content/en/reference/cli/dapr-upgrade.md b/daprdocs/content/en/reference/cli/dapr-upgrade.md
@@ -36,12 +36,12 @@ dapr upgrade -k
 
 ### Upgrade specified version of Dapr runtime in Kubernetes
 ```bash
-dapr upgrade -k --runtime-version 1.1.2
+dapr upgrade -k --runtime-version 1.2
 ```
 
 ### Upgrade specified version of Dapr runtime in Kubernetes with value set
 ```bash
-dapr upgrade -k --runtime-version 1.1.2 --set global.logAsJson=true
+dapr upgrade -k --runtime-version 1.2 --set global.logAsJson=true
 ```
 # Related links