fix: merge master

binary-com · Mar 21, 2024 · 9e0d8bc · 9e0d8bc
2 parents c433260 + f01c22a
commit 9e0d8bc
Show file tree

Hide file tree

Showing 31 changed files with 2,397 additions and 1,567 deletions.
diff --git a/.github/workflows/corewebvitals.yml b/.github/workflows/corewebvitals.yml
@@ -53,7 +53,7 @@ jobs:
                   DATADOG_APP_KEY: ${{ secrets.GATSBY_DATADOG_APPLICATION_ID }}
 
             - name: Post audit comment
-              uses: marocchino/sticky-pull-request-comment@v2
+              uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31
               with:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
                   header: Core Web Vitals Audit

diff --git a/.github/workflows/generate-preview-link-eu.yml b/.github/workflows/generate-preview-link-eu.yml
@@ -15,7 +15,8 @@ concurrency:
 
 jobs:
     build_eu_to_cloudflare_pages:
-        runs-on: Runner_16cores
+        runs-on: Ubuntu-latest
+        if: contains(github.event.pull_request.head.ref, 'multiple-build')
         permissions:
           checks: write
           pull-requests: write
@@ -48,7 +49,7 @@ jobs:
                       core.setOutput("comment", comment);
 
             - name: Post Cloudflare Pages Preview comment
-              uses: marocchino/sticky-pull-request-comment@efaaab3fd41a9c3de579aba759d2552635e590fd
+              uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31
               with:
                   header: Cloudflare Pages EU Preview Comment
                   number: ${{github.event.pull_request.user.login}}
@@ -167,7 +168,7 @@ jobs:
                       core.setOutput("comment", comment);
             - name: Post Cloudflare Pages Preview comment
               if: success() || failure()
-              uses: marocchino/sticky-pull-request-comment@efaaab3fd41a9c3de579aba759d2552635e590fd
+              uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31
               with:
                   header: Cloudflare Pages Preview Comment
                   number: ${{github.event.number}}

diff --git a/.github/workflows/generate-preview-link-row.yml b/.github/workflows/generate-preview-link-row.yml
@@ -15,7 +15,9 @@ concurrency:
 
 jobs:
     build_row_to_cloudflare_pages:
-        runs-on: Runner_16cores
+        runs-on: Ubuntu-latest
+        # To be removed once released in production
+        if: contains(github.event.pull_request.head.ref, 'multiple-build')
         permissions:
           checks: write
           pull-requests: write
@@ -48,7 +50,7 @@ jobs:
                       core.setOutput("comment", comment);
 
             - name: Post Cloudflare Pages Preview comment
-              uses: marocchino/sticky-pull-request-comment@efaaab3fd41a9c3de579aba759d2552635e590fd
+              uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31
               with:
                   header: Cloudflare Pages ROW Preview Comment
                   number: ${{github.event.pull_request.user.login}}
@@ -167,7 +169,7 @@ jobs:
                       core.setOutput("comment", comment);
             - name: Post Cloudflare Pages Preview comment
               if: success() || failure()
-              uses: marocchino/sticky-pull-request-comment@efaaab3fd41a9c3de579aba759d2552635e590fd
+              uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31
               with:
                   header: Cloudflare Pages Preview Comment
                   number: ${{github.event.number}}

diff --git a/.github/workflows/generate-preview-link.yml b/.github/workflows/generate-preview-link.yml
@@ -48,7 +48,7 @@ jobs:
                       core.setOutput("comment", comment);
 
             - name: Post Cloudflare Pages Preview comment
-              uses: marocchino/sticky-pull-request-comment@efaaab3fd41a9c3de579aba759d2552635e590fd
+              uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31
               with:
                   header: Cloudflare Pages Preview Comment
                   number: ${{github.event.pull_request.user.login}}
@@ -106,11 +106,13 @@ jobs:
                   EVENT_NUMBER: ${{ github.event.number }}
                   EVENT_USERNAME: ${{ github.event.pull_request.user.login }}
                   HEAD_REF: ${{ github.head_ref }}
+                  DRAFT: ${{ github.event.pull_request.draft }}
               run: |
                   mkdir -p .pr
                   echo "$EVENT_NUMBER" > .pr/NR
                   echo "$EVENT_USERNAME" > .pr/USERNAME
                   echo "$HEAD_REF" > .pr/BRANCHNAME
+                  echo "$DRAFT" > .pr/DRAFT
 
             - name: Publish to Cloudflare Pages
               id: publish-to-pages
@@ -174,7 +176,7 @@ jobs:
                       core.setOutput("comment", comment);
             - name: Post Cloudflare Pages Preview comment
               if: success() || failure()
-              uses: marocchino/sticky-pull-request-comment@efaaab3fd41a9c3de579aba759d2552635e590fd
+              uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31
               with:
                   header: Cloudflare Pages Preview Comment
                   number: ${{github.event.number}}

diff --git a/.github/workflows/lighthouse.yml b/.github/workflows/lighthouse.yml
@@ -37,7 +37,7 @@ jobs:
 
             - name: Add comment to PR
               id: loading_comment_to_pr
-              uses: marocchino/sticky-pull-request-comment@v2
+              uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31
               with:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
                   number: ${{ steps.pr_information.outputs.issue_number }}
@@ -98,7 +98,7 @@ jobs:
 
             - name: Add comment to PR
               id: comment_to_pr
-              uses: marocchino/sticky-pull-request-comment@v2
+              uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31
               with:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
                   number: ${{ github.event.issue.number }}

diff --git a/.github/workflows/smoketests.yml b/.github/workflows/smoketests.yml
@@ -40,6 +40,11 @@ jobs:
                   echo "preview_url=$(cat ./pr/PREVIEW_URL)" >> $GITHUB_OUTPUT
                   echo "branch_name=$(cat ./pr/BRANCHNAME)" >> $GITHUB_OUTPUT
                   echo "user_name=$(cat ./pr/USERNAME)" >> $GITHUB_OUTPUT
+                  echo "draft=$(cat ./pr/DRAFT)" >> $GITHUB_OUTPUT
+                  
+            - name: pr_info_debug 🔍
+              run: |
+               echo "PR Draft value ={{ $steps.pr_information.outputs.draft }}--"
 
             - name: Checkout external repository with Cypress tests
               uses: actions/checkout@v4
@@ -48,7 +53,7 @@ jobs:
 
             - name: Cypress run
               # Uses the official Cypress GitHub action https://github.com/cypress-io/github-action
-              if: "!contains(steps.pr_information.outputs.branch_name, 'quill')"
+              if: "contains(steps.pr_information.outputs.draft, 'false')"
               uses: cypress-io/github-action@v6
               with:
                   # Records to Cypress Cloud
@@ -71,7 +76,7 @@ jobs:
 
             - name: Set comments message
               id: set_msg
-              if: always() && !contains(steps.pr_information.outputs.branch_name, 'quill')
+              if: always() && contains(steps.pr_information.outputs.draft, 'false')
               run: |
                   # Using shell script to conditionally set the message
                   if [[ "${{ job.status }}" == "success" ]]; then
@@ -81,8 +86,8 @@ jobs:
                   fi
 
             - name: Leave comment
-              if: always() && !contains(steps.pr_information.outputs.branch_name, 'quill')
-              uses: marocchino/sticky-pull-request-comment@v2
+              if: always() && contains(steps.pr_information.outputs.draft, 'false')
+              uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31
               with:
                   header: Smoke tests status update
                   number: ${{ steps.pr_information.outputs.issue_number }}