Skip to content

Commit 02ba12d

Browse files
hhunter-mshhunter-ms
authored
Merge pull request #4468 from hhunter-ms/endgame_1.15-updates
[Endgame] Prep v1.15 branch for v1.15 release
2 parents e18a469 + 9077f56 commit 02ba12d

File tree

5 files changed

+127
-13
lines changed

5 files changed

+127
-13
lines changed

‎.github/workflows/website-root.yml

+109
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
name: Azure Static Web App Root
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
branches:
7+
- v1.15
8+
pull_request:
9+
types: [opened, synchronize, reopened, closed]
10+
branches:
11+
- v1.15
12+
13+
concurrency:
14+
# Cancel the previously triggered build for only PR build.
15+
group: website-${{ github.event.pull_request.number || github.sha }}
16+
cancel-in-progress: true
17+
18+
jobs:
19+
build_and_deploy_job:
20+
name: Build Hugo Website
21+
if: github.event.action != 'closed'
22+
runs-on: ubuntu-latest
23+
env:
24+
SWA_BASE: 'proud-bay-0e9e0e81e'
25+
HUGO_ENV: production
26+
steps:
27+
- name: Checkout docs repo
28+
uses: actions/checkout@v3
29+
with:
30+
submodules: true
31+
- name: Setup Node
32+
uses: actions/setup-node@v2
33+
with:
34+
node-version: '14'
35+
- name: Setup Hugo
36+
uses: peaceiris/[email protected]
37+
with:
38+
hugo-version: 0.102.3
39+
extended: true
40+
- name: Setup Docsy
41+
run: |
42+
cd daprdocs
43+
git submodule update --init --recursive
44+
sudo npm install -D --save autoprefixer
45+
sudo npm install -D --save postcss-cli
46+
- name: Build Hugo Website
47+
run: |
48+
cd daprdocs
49+
git config --global --add safe.directory /github/workspace
50+
if [ $GITHUB_EVENT_NAME == 'pull_request' ]; then
51+
STAGING_URL="https://${SWA_BASE}-${{github.event.number}}.westus2.azurestaticapps.net/"
52+
fi
53+
hugo ${STAGING_URL+-b "$STAGING_URL"}
54+
- name: Deploy docs site
55+
uses: Azure/static-web-apps-deploy@v1
56+
with:
57+
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PROUD_BAY_0E9E0E81E }}
58+
repo_token: ${{ secrets.GITHUB_TOKEN }}
59+
action: "upload"
60+
app_location: "daprdocs/public/"
61+
api_location: "daprdocs/public/"
62+
output_location: ""
63+
skip_app_build: true
64+
skip_deploy_on_missing_secrets: true
65+
- name: Upload Hugo artifacts
66+
uses: actions/upload-artifact@v4
67+
with:
68+
name: hugo_build
69+
path: ./daprdocs/public/
70+
if-no-files-found: error
71+
72+
close_staging_site:
73+
if: github.event_name == 'pull_request' && github.event.action == 'closed'
74+
runs-on: ubuntu-latest
75+
name: Close Pull Request Job
76+
steps:
77+
- name: Close Pull Request
78+
id: closepullrequest
79+
uses: Azure/static-web-apps-deploy@v1
80+
with:
81+
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PROUD_BAY_0E9E0E81E }}
82+
action: "close"
83+
skip_deploy_on_missing_secrets: true
84+
85+
algolia_index:
86+
name: Index site for Algolia
87+
if: github.event_name == 'push'
88+
needs: ['build_and_deploy_job']
89+
runs-on: ubuntu-latest
90+
env:
91+
ALGOLIA_APP_ID: ${{ secrets.ALGOLIA_APP_ID }}
92+
ALGOLIA_API_WRITE_KEY: ${{ secrets.ALGOLIA_API_WRITE_KEY }}
93+
ALGOLIA_INDEX_NAME: daprdocs
94+
steps:
95+
- name: Checkout docs repo
96+
uses: actions/checkout@v2
97+
with:
98+
submodules: false
99+
- name: Download Hugo artifacts
100+
uses: actions/download-artifact@v3
101+
with:
102+
name: hugo_build
103+
path: site/
104+
- name: Install Python packages
105+
run: |
106+
pip install --upgrade bs4
107+
pip install --upgrade 'algoliasearch>=2.0,<3.0'
108+
- name: Index site
109+
run: python ./.github/scripts/algolia.py ./site

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ The following branches are currently maintained:
1616

1717
| Branch | Website | Description |
1818
| ------------------------------------------------------------ | -------------------------- | ------------------------------------------------------------------------------------------------ |
19-
| [v1.14](https://github.com/dapr/docs) (primary) | https://docs.dapr.io | Latest Dapr release documentation. Typo fixes, clarifications, and most documentation goes here. |
20-
| [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. |
19+
| [v1.15](https://github.com/dapr/docs) (primary) | https://docs.dapr.io | Latest Dapr release documentation. Typo fixes, clarifications, and most documentation goes here. |
20+
| [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.15+ go here. |
2121

2222
For more information visit the [Dapr branch structure](https://docs.dapr.io/contributing/docs-contrib/contributing-docs/#branch-guidance) document.
2323

‎daprdocs/config.toml

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Site Configuration
2-
baseURL = "https://v1-15.docs.dapr.io"
2+
baseURL = "https://docs.dapr.io"
33
title = "Dapr Docs"
44
theme = "docsy"
55
disableFastRender = true
@@ -203,17 +203,20 @@ github_subdir = "daprdocs"
203203
github_branch = "v1.15"
204204

205205
# Versioning
206-
version_menu = "v1.15 (preview)"
206+
version_menu = "v1.15 (latest)"
207207
version = "v1.15"
208208
archived_version = false
209209
url_latest_version = "https://docs.dapr.io"
210210

211211
[[params.versions]]
212-
version = "v1.15 (preview)"
212+
version = "v1.16 (preview)"
213+
url = "https://v1-16.docs.dapr.io"
214+
[[params.versions]]
215+
version = "v1.15 (latest)"
213216
url = "#"
214217
[[params.versions]]
215-
version = "v1.14 (latest)"
216-
url = "https://docs.dapr.io"
218+
version = "v1.14"
219+
url = "https://v1-14.docs.dapr.io"
217220
[[params.versions]]
218221
version = "v1.13"
219222
url = "https://v1-13.docs.dapr.io"

‎daprdocs/content/en/operations/support/support-release-policy.md

+7-5
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,12 @@ The table below shows the versions of Dapr releases that have been tested togeth
4545

4646
| Release date | Runtime | CLI | SDKs | Dashboard | Status | Release notes |
4747
|--------------------|:--------:|:--------|---------|---------|---------|------------|
48-
| September 16th 2024 | 1.14.4</br> | 1.14.1 | Java 1.12.0 </br>Go 1.11.0 </br>PHP 1.2.0 </br>Python 1.14.0 </br>.NET 1.14.0 </br>JS 3.3.1 | 0.15.0 | Supported (current) | [v1.14.4 release notes](https://github.com/dapr/dapr/releases/tag/v1.14.4) |
48+
| February 27th 2025 | 1.15.0</br> | 1.15.0 | Java 1.14.0 </br>Go 1.12.0 </br>PHP 1.2.0 </br>Python 1.15.0 </br>.NET 1.15.0 </br>JS 3.5.0 </br>Rust 0.16 | 0.15.0 | Supported (current) | [v1.15.0 release notes](https://github.com/dapr/dapr/releases/tag/v1.15.0) |
49+
| September 16th 2024 | 1.14.4</br> | 1.14.1 | Java 1.12.0 </br>Go 1.11.0 </br>PHP 1.2.0 </br>Python 1.14.0 </br>.NET 1.14.0 </br>JS 3.3.1 | 0.15.0 | Supported | [v1.14.4 release notes](https://github.com/dapr/dapr/releases/tag/v1.14.4) |
4950
| September 13th 2024 | 1.14.3</br> | 1.14.1 | Java 1.12.0 </br>Go 1.11.0 </br>PHP 1.2.0 </br>Python 1.14.0 </br>.NET 1.14.0 </br>JS 3.3.1 | 0.15.0 | ⚠️ Recalled | [v1.14.3 release notes](https://github.com/dapr/dapr/releases/tag/v1.14.3) |
50-
| September 6th 2024 | 1.14.2</br> | 1.14.1 | Java 1.12.0 </br>Go 1.11.0 </br>PHP 1.2.0 </br>Python 1.14.0 </br>.NET 1.14.0 </br>JS 3.3.1 | 0.15.0 | Supported (current) | [v1.14.2 release notes](https://github.com/dapr/dapr/releases/tag/v1.14.2) |
51-
| August 14th 2024 | 1.14.1</br> | 1.14.1 | Java 1.12.0 </br>Go 1.11.0 </br>PHP 1.2.0 </br>Python 1.14.0 </br>.NET 1.14.0 </br>JS 3.3.1 | 0.15.0 | Supported (current) | [v1.14.1 release notes](https://github.com/dapr/dapr/releases/tag/v1.14.1) |
52-
| August 14th 2024 | 1.14.0</br> | 1.14.0 | Java 1.12.0 </br>Go 1.11.0 </br>PHP 1.2.0 </br>Python 1.14.0 </br>.NET 1.14.0 </br>JS 3.3.1 | 0.15.0 | Supported (current) | [v1.14.0 release notes](https://github.com/dapr/dapr/releases/tag/v1.14.0) |
51+
| September 6th 2024 | 1.14.2</br> | 1.14.1 | Java 1.12.0 </br>Go 1.11.0 </br>PHP 1.2.0 </br>Python 1.14.0 </br>.NET 1.14.0 </br>JS 3.3.1 | 0.15.0 | Supported | [v1.14.2 release notes](https://github.com/dapr/dapr/releases/tag/v1.14.2) |
52+
| August 14th 2024 | 1.14.1</br> | 1.14.1 | Java 1.12.0 </br>Go 1.11.0 </br>PHP 1.2.0 </br>Python 1.14.0 </br>.NET 1.14.0 </br>JS 3.3.1 | 0.15.0 | Supported | [v1.14.1 release notes](https://github.com/dapr/dapr/releases/tag/v1.14.1) |
53+
| August 14th 2024 | 1.14.0</br> | 1.14.0 | Java 1.12.0 </br>Go 1.11.0 </br>PHP 1.2.0 </br>Python 1.14.0 </br>.NET 1.14.0 </br>JS 3.3.1 | 0.15.0 | Supported | [v1.14.0 release notes](https://github.com/dapr/dapr/releases/tag/v1.14.0) |
5354
| May 29th 2024 | 1.13.4</br> | 1.13.0 | Java 1.11.0 </br>Go 1.10.0 </br>PHP 1.2.0 </br>Python 1.13.0 </br>.NET 1.13.0 </br>JS 3.3.0 | 0.14.0 | Supported | [v1.13.4 release notes](https://github.com/dapr/dapr/releases/tag/v1.13.4) |
5455
| May 21st 2024 | 1.13.3</br> | 1.13.0 | Java 1.11.0 </br>Go 1.10.0 </br>PHP 1.2.0 </br>Python 1.13.0 </br>.NET 1.13.0 </br>JS 3.3.0 | 0.14.0 | Supported | [v1.13.3 release notes](https://github.com/dapr/dapr/releases/tag/v1.13.3) |
5556
| April 3rd 2024 | 1.13.2</br> | 1.13.0 | Java 1.11.0 </br>Go 1.10.0 </br>PHP 1.2.0 </br>Python 1.13.0 </br>.NET 1.13.0 </br>JS 3.3.0 | 0.14.0 | Supported | [v1.13.2 release notes](https://github.com/dapr/dapr/releases/tag/v1.13.2) |
@@ -143,7 +144,8 @@ General guidance on upgrading can be found for [self hosted mode]({{< ref self-h
143144
| 1.11.0 to 1.11.4 | N/A | 1.12.4 |
144145
| 1.12.0 to 1.12.4 | N/A | 1.13.5 |
145146
| 1.13.0 to 1.13.5 | N/A | 1.14.0 |
146-
| 1.14.0 to 1.14.2 | N/A | 1.14.2 |
147+
| 1.14.0 to 1.14.4 | N/A | 1.14.4 |
148+
| 1.15.0 | N/A | 1.15.0 |
147149

148150
## Upgrade on Hosting platforms
149151

‎daprdocs/layouts/shortcodes/dapr-latest-version.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{{- if .Get "short" }}1.14{{ else if .Get "long" }}1.14.4{{ else if .Get "cli" }}1.14.1{{ else }}1.14.1{{ end -}}
1+
{{- if .Get "short" }}1.15{{ else if .Get "long" }}1.15.0{{ else if .Get "cli" }}1.15.0{{ else }}1.15.0{{ end -}}

0 commit comments

Comments
 (0)