From f1bf03bb7dace24e50621154b07a170d5aeb12e7 Mon Sep 17 00:00:00 2001 From: Hannah Hunter Date: Thu, 19 Dec 2024 11:04:41 -0500 Subject: [PATCH 1/3] config toml Signed-off-by: Hannah Hunter --- .github/workflows/website-v1-15.yml | 10 +++++----- daprdocs/config.toml | 15 +++++++++------ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.github/workflows/website-v1-15.yml b/.github/workflows/website-v1-15.yml index 645aee7436c..ee9c431e42e 100644 --- a/.github/workflows/website-v1-15.yml +++ b/.github/workflows/website-v1-15.yml @@ -1,14 +1,14 @@ -name: Azure Static Web App v1.15 +name: Azure Static Web App v1.16 on: workflow_dispatch: push: branches: - - v1.15 + - v1.16 pull_request: types: [opened, synchronize, reopened, closed] branches: - - v1.15 + - v1.16 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_15 }} + azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_V1_16 }} 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_15 }} + azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_V1_16 }} skip_deploy_on_missing_secrets: true action: "close" diff --git a/daprdocs/config.toml b/daprdocs/config.toml index ad036463628..5cbcde9a6d4 100644 --- a/daprdocs/config.toml +++ b/daprdocs/config.toml @@ -1,5 +1,5 @@ # Site Configuration -baseURL = "https://v1-15.docs.dapr.io" +baseURL = "https://v1-16.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.15" +github_branch = "v1.16" # Versioning -version_menu = "v1.15 (preview)" -version = "v1.15" +version_menu = "v1.16 (preview)" +version = "v1.16" archived_version = false url_latest_version = "https://docs.dapr.io" [[params.versions]] - version = "v1.15 (preview)" + version = "v1.16 (preview)" url = "#" [[params.versions]] - version = "v1.14 (latest)" + version = "v1.15 (latest)" url = "https://docs.dapr.io" + [[params.versions]] + version = "v1.14" + url = "https://v1-14.docs.dapr.io" [[params.versions]] version = "v1.13" url = "https://v1-13.docs.dapr.io" From 62619ec0599418aeea8047097288801ccd6554fd Mon Sep 17 00:00:00 2001 From: Hannah Hunter Date: Thu, 19 Dec 2024 11:05:02 -0500 Subject: [PATCH 2/3] website yml Signed-off-by: Hannah Hunter --- .github/workflows/website-v1-16.yml | 55 +++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 .github/workflows/website-v1-16.yml diff --git a/.github/workflows/website-v1-16.yml b/.github/workflows/website-v1-16.yml new file mode 100644 index 00000000000..ee9c431e42e --- /dev/null +++ b/.github/workflows/website-v1-16.yml @@ -0,0 +1,55 @@ +name: Azure Static Web App v1.16 + +on: + workflow_dispatch: + push: + branches: + - v1.16 + pull_request: + types: [opened, synchronize, reopened, closed] + branches: + - v1.16 + +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_16 }} + 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_16 }} + skip_deploy_on_missing_secrets: true + action: "close" From 8f124f06a66b5745613403246c81991d952845ac Mon Sep 17 00:00:00 2001 From: Hannah Hunter Date: Thu, 19 Dec 2024 11:08:34 -0500 Subject: [PATCH 3/3] update python version Signed-off-by: Hannah Hunter --- .github/workflows/link_validation.yaml | 4 +- .github/workflows/website-v1-15.yml | 55 -------------------------- 2 files changed, 2 insertions(+), 57 deletions(-) delete mode 100644 .github/workflows/website-v1-15.yml diff --git a/.github/workflows/link_validation.yaml b/.github/workflows/link_validation.yaml index 4b7840e3cb1..350f8407a33 100644 --- a/.github/workflows/link_validation.yaml +++ b/.github/workflows/link_validation.yaml @@ -13,7 +13,7 @@ jobs: validate: runs-on: ubuntu-latest env: - PYTHON_VER: 3.7 + PYTHON_VER: 3.12 steps: - uses: actions/checkout@v2 - name: Check Microsoft URLs do not pin localized versions @@ -27,7 +27,7 @@ jobs: exit 1 fi - name: Set up Python ${{ env.PYTHON_VER }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ env.PYTHON_VER }} - name: Install dependencies diff --git a/.github/workflows/website-v1-15.yml b/.github/workflows/website-v1-15.yml deleted file mode 100644 index ee9c431e42e..00000000000 --- a/.github/workflows/website-v1-15.yml +++ /dev/null @@ -1,55 +0,0 @@ -name: Azure Static Web App v1.16 - -on: - workflow_dispatch: - push: - branches: - - v1.16 - pull_request: - types: [opened, synchronize, reopened, closed] - branches: - - v1.16 - -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_16 }} - 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_16 }} - skip_deploy_on_missing_secrets: true - action: "close"