From 787ae17e60ecfc0d15a5fc12fe61620f3600de6a Mon Sep 17 00:00:00 2001 From: Hannah Hunter Date: Mon, 13 Feb 2023 10:26:10 -0600 Subject: [PATCH] endgame prep for v1.9 branch Signed-off-by: Hannah Hunter --- .github/workflows/website-root.yml | 54 ------------------------------ README.md | 4 +-- daprdocs/config.toml | 15 +++++---- 3 files changed, 11 insertions(+), 62 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 16c5874d4..000000000 --- a/.github/workflows/website-root.yml +++ /dev/null @@ -1,54 +0,0 @@ -name: Azure Static Web App Root - -on: - push: - branches: - - v1.9 - pull_request: - types: [opened, synchronize, reopened, closed] - branches: - - v1.9 - -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 - fetch-depth: 0 - - 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.100.2" - 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/README.md b/README.md index 4a9e9b7e1..2dd61a89e 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,8 @@ The following branches are currently maintained: | Branch | Website | Description | | ------------------------------------------------------------ | -------------------------- | ------------------------------------------------------------------------------------------------ | -| [v1.9](https://github.com/dapr/docs) (primary) | https://docs.dapr.io | Latest Dapr release documentation. Typo fixes, clarifications, and most documentation goes here. | -| [v1.10](https://github.com/dapr/docs/tree/v1.10) (pre-release) | https://v1-10.docs.dapr.io/ | Pre-release documentation. Doc updates that are only applicable to v1.10+ go here. | +| [v1.10](https://github.com/dapr/docs) (primary) | https://docs.dapr.io | Latest Dapr release documentation. Typo fixes, clarifications, and most documentation goes here. | +| [v1.11](https://github.com/dapr/docs/tree/v1.11) (pre-release) | https://v1-11.docs.dapr.io/ | Pre-release documentation. Doc updates that are only applicable to v1.11+ go here. | For more information visit the [Dapr branch structure](https://docs.dapr.io/contributing/docs-contrib/contributing-docs/#branch-guidance) document. diff --git a/daprdocs/config.toml b/daprdocs/config.toml index b89160e36..53f0886fa 100644 --- a/daprdocs/config.toml +++ b/daprdocs/config.toml @@ -1,5 +1,5 @@ # Site Configuration -baseURL = "https://docs.dapr.io/" +baseURL = "https://v1-9.docs.dapr.io/" title = "Dapr Docs" theme = "docsy" disableFastRender = true @@ -163,17 +163,20 @@ github_subdir = "daprdocs" github_branch = "v1.9" # Versioning -version_menu = "v1.9 (latest)" +version_menu = "v1.9" version = "v1.9" -archived_version = false +archived_version = true url_latest_version = "https://docs.dapr.io" [[params.versions]] - version = "v1.10 (preview)" - url = "https://v1-10.docs.dapr.io" + version = "v1.11 (preview)" + url = "https://v1-11.docs.dapr.io" [[params.versions]] - version = "v1.9 (latest)" + version = "v1.10 (latest)" url = "#" +[[params.versions]] + version = "v1.9" + url = "https://v1-9.docs.dapr.io" [[params.versions]] version = "v1.8" url = "https://v1-8.docs.dapr.io"