mirror of https://github.com/dapr/docs.git
Update to 1.2 (#1519)
This commit is contained in:
parent
aedc209244
commit
5d71c507d9
|
@ -1,13 +1,13 @@
|
||||||
name: Azure Static Web Apps CI/CD
|
name: Azure Static Web App Root
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- v1.1
|
- v1.2
|
||||||
pull_request:
|
pull_request:
|
||||||
types: [opened, synchronize, reopened, closed]
|
types: [opened, synchronize, reopened, closed]
|
||||||
branches:
|
branches:
|
||||||
- v1.1
|
- v1.2
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build_and_deploy_job:
|
build_and_deploy_job:
|
||||||
|
@ -27,11 +27,11 @@ jobs:
|
||||||
HUGO_ENV: production
|
HUGO_ENV: production
|
||||||
HUGO_VERSION: "0.74.3"
|
HUGO_VERSION: "0.74.3"
|
||||||
with:
|
with:
|
||||||
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_YELLOW_RIVER_084FE4E1E }}
|
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)
|
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
|
||||||
skip_deploy_on_missing_secrets: true
|
skip_deploy_on_missing_secrets: true
|
||||||
action: "upload"
|
action: "upload"
|
||||||
###### Repository/Build Configurations - These values can be configured to match you app requirements. ######
|
###### 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
|
# For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
|
||||||
app_location: "/daprdocs" # App source code path
|
app_location: "/daprdocs" # App source code path
|
||||||
api_location: "api" # Api source code path - optional
|
api_location: "api" # Api source code path - optional
|
||||||
|
@ -48,6 +48,6 @@ jobs:
|
||||||
id: closepullrequest
|
id: closepullrequest
|
||||||
uses: Azure/static-web-apps-deploy@v0.0.1-preview
|
uses: Azure/static-web-apps-deploy@v0.0.1-preview
|
||||||
with:
|
with:
|
||||||
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_YELLOW_RIVER_084FE4E1E }}
|
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PROUD_BAY_0E9E0E81E }}
|
||||||
skip_deploy_on_missing_secrets: true
|
skip_deploy_on_missing_secrets: true
|
||||||
action: "close"
|
action: "close"
|
|
@ -1,4 +1,4 @@
|
||||||
name: Azure Static Web Apps CI/CD
|
name: Azure Static Web App v1.2
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
|
@ -14,8 +14,8 @@ The following branches are currently maintained:
|
||||||
|
|
||||||
| Branch | Website | Description |
|
| 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) (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.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.
|
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
|
1. Make sure you're still in the `daprdocs` directory
|
||||||
2. Run
|
2. Run
|
||||||
```sh
|
```sh
|
||||||
hugo server --disableFastRender
|
hugo server
|
||||||
```
|
```
|
||||||
3. Navigate to `http://localhost:1313/`
|
3. Navigate to `http://localhost:1313/`
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# Site Configuration
|
# Site Configuration
|
||||||
baseURL = "https://v1-2.docs.dapr.io/"
|
baseURL = "https://docs.dapr.io/"
|
||||||
title = "Dapr Docs"
|
title = "Dapr Docs"
|
||||||
theme = "docsy"
|
theme = "docsy"
|
||||||
disableFastRender = true
|
disableFastRender = true
|
||||||
|
@ -136,17 +136,17 @@ github_subdir = "daprdocs"
|
||||||
github_branch = "v1.2"
|
github_branch = "v1.2"
|
||||||
|
|
||||||
# Versioning
|
# Versioning
|
||||||
version_menu = "v1.2 (preview)"
|
version_menu = "v1.2 (latest)"
|
||||||
version = "v1.2"
|
version = "v1.2"
|
||||||
archived_version = false
|
archived_version = false
|
||||||
url_latest_version = "https://docs.dapr.io"
|
url_latest_version = "https://docs.dapr.io"
|
||||||
|
|
||||||
[[params.versions]]
|
[[params.versions]]
|
||||||
version = "v1.2 (preview)"
|
version = "v1.2 (latest)"
|
||||||
url = "#"
|
url = "#"
|
||||||
[[params.versions]]
|
[[params.versions]]
|
||||||
version = "v1.1 (latest)"
|
version = "v1.1"
|
||||||
url = "https://docs.dapr.io"
|
url = "https://v1-1.docs.dapr.io"
|
||||||
[[params.versions]]
|
[[params.versions]]
|
||||||
version = "v1.0"
|
version = "v1.0"
|
||||||
url = "https://v1-0.docs.dapr.io"
|
url = "https://v1-0.docs.dapr.io"
|
||||||
|
|
|
@ -52,8 +52,8 @@ dapr --version
|
||||||
|
|
||||||
Output should look like this:
|
Output should look like this:
|
||||||
```
|
```
|
||||||
CLI version: 1.1.0
|
CLI version: 1.2.0
|
||||||
Runtime version: 1.1.2
|
Runtime version: 1.2.0
|
||||||
```
|
```
|
||||||
|
|
||||||
### Step 4: Verify containers are running
|
### Step 4: Verify containers are running
|
||||||
|
|
|
@ -122,7 +122,7 @@ The latest Dapr helm chart no longer supports Helm v2. Please migrate from Helm
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
helm upgrade --install dapr dapr/dapr \
|
helm upgrade --install dapr dapr/dapr \
|
||||||
--version=1.1.2 \
|
--version=1.2 \
|
||||||
--namespace dapr-system \
|
--namespace dapr-system \
|
||||||
--create-namespace \
|
--create-namespace \
|
||||||
--wait
|
--wait
|
||||||
|
@ -132,7 +132,7 @@ The latest Dapr helm chart no longer supports Helm v2. Please migrate from Helm
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
helm upgrade --install dapr dapr/dapr \
|
helm upgrade --install dapr dapr/dapr \
|
||||||
--version=1.1.2 \
|
--version=1.2 \
|
||||||
--namespace dapr-system \
|
--namespace dapr-system \
|
||||||
--create-namespace \
|
--create-namespace \
|
||||||
--set global.ha.enabled=true \
|
--set global.ha.enabled=true \
|
||||||
|
|
|
@ -25,11 +25,11 @@ description: "Follow these steps to upgrade Dapr in self-hosted mode and ensure
|
||||||
dapr init
|
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
|
```bash
|
||||||
$ dapr --version
|
$ dapr --version
|
||||||
|
|
||||||
CLI version: 1.1.0
|
CLI version: 1.2
|
||||||
Runtime version: 1.1.2
|
Runtime version: 1.2
|
||||||
```
|
```
|
||||||
|
|
|
@ -36,12 +36,12 @@ dapr upgrade -k
|
||||||
|
|
||||||
### Upgrade specified version of Dapr runtime in Kubernetes
|
### Upgrade specified version of Dapr runtime in Kubernetes
|
||||||
```bash
|
```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
|
### Upgrade specified version of Dapr runtime in Kubernetes with value set
|
||||||
```bash
|
```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
|
# Related links
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue