From aab34098292006f7c1cb34f03ed87c49f7de6453 Mon Sep 17 00:00:00 2001 From: Hannah Hunter Date: Thu, 15 Jun 2023 14:50:52 -0400 Subject: [PATCH 1/5] update dapr publish command Signed-off-by: Hannah Hunter Signed-off-by: Aaron Crawfis --- .../building-blocks/pubsub/pubsub-cloudevents.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daprdocs/content/en/developing-applications/building-blocks/pubsub/pubsub-cloudevents.md b/daprdocs/content/en/developing-applications/building-blocks/pubsub/pubsub-cloudevents.md index 251d3f234c1..51d442f8a71 100644 --- a/daprdocs/content/en/developing-applications/building-blocks/pubsub/pubsub-cloudevents.md +++ b/daprdocs/content/en/developing-applications/building-blocks/pubsub/pubsub-cloudevents.md @@ -92,7 +92,7 @@ You can add additional fields to a custom CloudEvent that are not part of the of Publish a CloudEvent to the `orders` topic: ```bash -dapr publish --publish-app-id orderprocessing --pubsub order-pub-sub --topic orders --data '{"specversion" : "1.0", "type" : "com.dapr.cloudevent.sent", "source" : "testcloudeventspubsub", "subject" : "Cloud Events Test", "id" : "someCloudEventId", "time" : "2021-08-02T09:00:00Z", "datacontenttype" : "application/cloudevents+json", "data" : {"orderId": "100"}}' +dapr publish --publish-app-id orderprocessing --pubsub order-pub-sub --topic orders --data '{\"orderId\": \"100\"}' ``` {{% /codetab %}} From f046f3a04a35e55799bd0dbea7649c8f44ce96aa Mon Sep 17 00:00:00 2001 From: Aaron Crawfis Date: Fri, 16 Jun 2023 13:57:54 -0700 Subject: [PATCH 2/5] Split workflow into two steps Signed-off-by: Aaron Crawfis --- .github/workflows/website-root.yml | 78 ++++++++++++++++++++++-------- 1 file changed, 58 insertions(+), 20 deletions(-) diff --git a/.github/workflows/website-root.yml b/.github/workflows/website-root.yml index 0265713f715..9086adde63f 100644 --- a/.github/workflows/website-root.yml +++ b/.github/workflows/website-root.yml @@ -1,6 +1,7 @@ -name: Azure Static Web App Root +name: Dapr Root Website on: + workflow_dispatch: push: branches: - v1.11 @@ -10,34 +11,71 @@ on: - v1.11 jobs: - build_and_deploy_job: - if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed') + build: + name: Build Hugo Website + if: github.event.action != 'closed' runs-on: ubuntu-latest - name: Build and Deploy Job + env: + SWA_BASE: 'proud-bay-0e9e0e81e' + HUGO_ENV: production steps: - - uses: actions/checkout@v3 + - name: Checkout docs repo + uses: actions/checkout@v3 with: - submodules: recursive - fetch-depth: 0 + submodules: true + - name: Setup Node + uses: actions/setup-node@v2 + with: + node-version: '14' + - name: Setup Hugo + uses: peaceiris/actions-hugo@v2.5.0 + with: + hugo-version: 0.102.3 + extended: true - 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 + run: | + cd daprdocs + git submodule update --init --recursive + sudo npm install -D --save autoprefixer + sudo npm install -D --save postcss-cli + - name: Build Hugo Website + run: | + cd daprdocs + git config --global --add safe.directory /github/workspace + if [ $GITHUB_EVENT_NAME == 'pull_request' ]; then + STAGING_URL="https://${SWA_BASE}-${{github.event.number}}.westus2.azurestaticapps.net/" + fi + hugo ${STAGING_URL+-b "$STAGING_URL"} + - name: Upload Hugo artifacts + uses: actions/upload-artifact@v3 + with: + name: hugo_build + path: ./docs/public/ + if-no-files-found: error + + deploy: + name: Deploy website + needs: ['build'] + if: github.event.action != 'closed' + runs-on: ubuntu-latest + steps: + - name: Download Hugo artifacts + uses: actions/download-artifact@v3 + with: + name: hugo_build + path: site/ + - name: Deploy staging site 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_API_TOKEN_PROUD_BAY_0E9E0E81E }} - skip_deploy_on_missing_secrets: true - repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments) + repo_token: ${{ secrets.GITHUB_TOKEN }} action: "upload" - app_location: "/daprdocs" - app_build_command: "git config --global --add safe.directory /github/workspace && hugo" - output_location: "public" - skip_api_build: true + app_location: "site/" + api_location: "site/" + output_location: "" + skip_app_build: true - close_pull_request_job: + close_staging_site: if: github.event_name == 'pull_request' && github.event.action == 'closed' runs-on: ubuntu-latest name: Close Pull Request Job From 72ca8d0771859d6f6cc6b25871f20e9557f96f5f Mon Sep 17 00:00:00 2001 From: Aaron Crawfis Date: Fri, 16 Jun 2023 15:12:33 -0700 Subject: [PATCH 3/5] Update upload path Signed-off-by: Aaron Crawfis --- .github/workflows/website-root.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/website-root.yml b/.github/workflows/website-root.yml index 9086adde63f..1368257fc38 100644 --- a/.github/workflows/website-root.yml +++ b/.github/workflows/website-root.yml @@ -50,7 +50,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: hugo_build - path: ./docs/public/ + path: ./daprdocs/public/ if-no-files-found: error deploy: From 0bcf6a824afa8411f169d11d381075c31be2fc5d Mon Sep 17 00:00:00 2001 From: Aaron Crawfis Date: Fri, 16 Jun 2023 15:15:57 -0700 Subject: [PATCH 4/5] Add concurrency check Signed-off-by: Aaron Crawfis --- .github/workflows/website-root.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/website-root.yml b/.github/workflows/website-root.yml index 1368257fc38..7627c03dc17 100644 --- a/.github/workflows/website-root.yml +++ b/.github/workflows/website-root.yml @@ -10,6 +10,11 @@ on: branches: - v1.11 +concurrency: + # Cancel the previously triggered build for only PR build. + group: website-${{ github.event.pull_request.number || github.sha }} + cancel-in-progress: true + jobs: build: name: Build Hugo Website From e10282c4f119d9f1474694ac2dd9b287adb60caf Mon Sep 17 00:00:00 2001 From: Aaron Crawfis Date: Fri, 16 Jun 2023 18:04:54 -0700 Subject: [PATCH 5/5] Consolidate jobs Signed-off-by: Aaron Crawfis --- .github/workflows/website-root.yml | 34 ++++++++++-------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/.github/workflows/website-root.yml b/.github/workflows/website-root.yml index 7627c03dc17..98d2aec1199 100644 --- a/.github/workflows/website-root.yml +++ b/.github/workflows/website-root.yml @@ -1,4 +1,4 @@ -name: Dapr Root Website +name: Azure Static Web App Root on: workflow_dispatch: @@ -16,7 +16,7 @@ concurrency: cancel-in-progress: true jobs: - build: + build_and_deploy_job: name: Build Hugo Website if: github.event.action != 'closed' runs-on: ubuntu-latest @@ -51,34 +51,22 @@ jobs: STAGING_URL="https://${SWA_BASE}-${{github.event.number}}.westus2.azurestaticapps.net/" fi hugo ${STAGING_URL+-b "$STAGING_URL"} - - name: Upload Hugo artifacts - uses: actions/upload-artifact@v3 - with: - name: hugo_build - path: ./daprdocs/public/ - if-no-files-found: error - - deploy: - name: Deploy website - needs: ['build'] - if: github.event.action != 'closed' - runs-on: ubuntu-latest - steps: - - name: Download Hugo artifacts - uses: actions/download-artifact@v3 - with: - name: hugo_build - path: site/ - - name: Deploy staging site + - name: Deploy docs site uses: Azure/static-web-apps-deploy@v1 with: azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PROUD_BAY_0E9E0E81E }} repo_token: ${{ secrets.GITHUB_TOKEN }} action: "upload" - app_location: "site/" - api_location: "site/" + app_location: "daprdocs/public/" + api_location: "daprdocs/public/" output_location: "" skip_app_build: true + - name: Upload Hugo artifacts + uses: actions/upload-artifact@v3 + with: + name: hugo_build + path: ./daprdocs/public/ + if-no-files-found: error close_staging_site: if: github.event_name == 'pull_request' && github.event.action == 'closed'