From 50239157d257212dc3d777aab2a01899b5408c81 Mon Sep 17 00:00:00 2001 From: Hannah Hunter Date: Mon, 15 Jul 2024 11:32:02 -0400 Subject: [PATCH 1/3] update config.toml for v1.15 Signed-off-by: Hannah Hunter --- daprdocs/config.toml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/daprdocs/config.toml b/daprdocs/config.toml index 4ea4fba47cf..ad036463628 100644 --- a/daprdocs/config.toml +++ b/daprdocs/config.toml @@ -1,5 +1,5 @@ # Site Configuration -baseURL = "https://v1-14.docs.dapr.io" +baseURL = "https://v1-15.docs.dapr.io" title = "Dapr Docs" theme = "docsy" disableFastRender = true @@ -196,20 +196,23 @@ offlineSearch = false github_repo = "https://github.com/dapr/docs" github_project_repo = "https://github.com/dapr/dapr" github_subdir = "daprdocs" -github_branch = "v1.14" +github_branch = "v1.15" # Versioning -version_menu = "v1.14 (preview)" -version = "v1.14" +version_menu = "v1.15 (preview)" +version = "v1.15" archived_version = false url_latest_version = "https://docs.dapr.io" [[params.versions]] - version = "v1.14 (preview)" + version = "v1.15 (preview)" url = "#" [[params.versions]] - version = "v1.13 (latest)" + version = "v1.14 (latest)" url = "https://docs.dapr.io" +[[params.versions]] + version = "v1.13" + url = "https://v1-13.docs.dapr.io" [[params.versions]] version = "v1.12" url = "https://v1-12.docs.dapr.io" From d55a09c6fc0e40bbcc02a141d144cca67c28668e Mon Sep 17 00:00:00 2001 From: Hannah Hunter Date: Wed, 31 Jul 2024 11:36:51 -0400 Subject: [PATCH 2/3] update website version yml Signed-off-by: Hannah Hunter --- .github/workflows/website-v1-14.yml | 8 ++--- .github/workflows/website-v1-15.yml | 55 +++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/website-v1-15.yml diff --git a/.github/workflows/website-v1-14.yml b/.github/workflows/website-v1-14.yml index a32aa6d42ba..1495c5aa107 100644 --- a/.github/workflows/website-v1-14.yml +++ b/.github/workflows/website-v1-14.yml @@ -4,11 +4,11 @@ on: workflow_dispatch: push: branches: - - v1.14 + - v1.15 pull_request: types: [opened, synchronize, reopened, closed] branches: - - v1.14 + - v1.15 jobs: build_and_deploy_job: @@ -29,7 +29,7 @@ jobs: HUGO_ENV: production HUGO_VERSION: "0.100.2" with: - azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_V1_14 }} + azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_V1_15 }} repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments) skip_deploy_on_missing_secrets: true action: "upload" @@ -50,6 +50,6 @@ jobs: id: closepullrequest uses: Azure/static-web-apps-deploy@v1 with: - azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_V1_14 }} + azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_V1_15 }} skip_deploy_on_missing_secrets: true action: "close" diff --git a/.github/workflows/website-v1-15.yml b/.github/workflows/website-v1-15.yml new file mode 100644 index 00000000000..1495c5aa107 --- /dev/null +++ b/.github/workflows/website-v1-15.yml @@ -0,0 +1,55 @@ +name: Azure Static Web App v1.14 + +on: + workflow_dispatch: + push: + branches: + - v1.15 + pull_request: + types: [opened, synchronize, reopened, closed] + branches: + - v1.15 + +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@v1 + env: + HUGO_ENV: production + HUGO_VERSION: "0.100.2" + with: + azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_V1_15 }} + 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: "git config --global --add safe.directory /github/workspace && 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@v1 + with: + azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_V1_15 }} + skip_deploy_on_missing_secrets: true + action: "close" From e13c59e1d1259bd46ceeaabc1f3057d87c65d1c4 Mon Sep 17 00:00:00 2001 From: Hannah Hunter Date: Wed, 31 Jul 2024 11:38:14 -0400 Subject: [PATCH 3/3] remove v1.14 yml Signed-off-by: Hannah Hunter --- .github/workflows/website-v1-14.yml | 55 ----------------------------- 1 file changed, 55 deletions(-) delete mode 100644 .github/workflows/website-v1-14.yml diff --git a/.github/workflows/website-v1-14.yml b/.github/workflows/website-v1-14.yml deleted file mode 100644 index 1495c5aa107..00000000000 --- a/.github/workflows/website-v1-14.yml +++ /dev/null @@ -1,55 +0,0 @@ -name: Azure Static Web App v1.14 - -on: - workflow_dispatch: - push: - branches: - - v1.15 - pull_request: - types: [opened, synchronize, reopened, closed] - branches: - - v1.15 - -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@v1 - env: - HUGO_ENV: production - HUGO_VERSION: "0.100.2" - with: - azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_V1_15 }} - 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: "git config --global --add safe.directory /github/workspace && 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@v1 - with: - azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_V1_15 }} - skip_deploy_on_missing_secrets: true - action: "close"