Merge pull request #14917 from github/repo-sync

repo sync

Author: Octomerger

.github/workflows/prod-build-deploy-azure.yml

@@ -135,13 +135,12 @@ jobs:
         run: |
           az webapp deployment slot swap --slot preview --target-slot production -n ghdocs-prod -g docs-prod
 
-      # TODO - enable this when we disable the other production deploy
-      # - name: Purge Fastly edge cache
-      #   env:
-      #     FASTLY_TOKEN: ${{ secrets.FASTLY_TOKEN }}
-      #     FASTLY_SERVICE_ID: ${{ secrets.FASTLY_SERVICE_ID }}
-      #     FASTLY_SURROGATE_KEY: 'every-deployment'
-      #   run: npm install got && .github/actions-scripts/purge-fastly-edge-cache.js
+      - name: Purge Fastly edge cache
+        env:
+          FASTLY_TOKEN: ${{ secrets.FASTLY_TOKEN }}
+          FASTLY_SERVICE_ID: ${{ secrets.FASTLY_SERVICE_ID }}
+          FASTLY_SURROGATE_KEY: 'every-deployment'
+        run: npm install got && .github/actions-scripts/purge-fastly-edge-cache.js
 
       - name: Send Slack notification if workflow failed
         uses: someimportantcompany/github-actions-slack-message@f8d28715e7b8a4717047d23f48c39827cacad340

.github/workflows/prod-build-deploy.yml

@@ -182,12 +182,12 @@ jobs:
             })
             console.log('⏲️ Deployment status: error - The deployment timed out...')
 
-      - name: Purge Fastly edge cache
-        env:
-          FASTLY_TOKEN: ${{ secrets.FASTLY_TOKEN }}
-          FASTLY_SERVICE_ID: ${{ secrets.FASTLY_SERVICE_ID }}
-          FASTLY_SURROGATE_KEY: 'every-deployment'
-        run: .github/actions-scripts/purge-fastly-edge-cache.js
+      # - name: Purge Fastly edge cache
+      #   env:
+      #     FASTLY_TOKEN: ${{ secrets.FASTLY_TOKEN }}
+      #     FASTLY_SERVICE_ID: ${{ secrets.FASTLY_SERVICE_ID }}
+      #     FASTLY_SURROGATE_KEY: 'every-deployment'
+      #   run: .github/actions-scripts/purge-fastly-edge-cache.js
 
       - name: Send Slack notification if workflow failed
         uses: someimportantcompany/github-actions-slack-message@f8d28715e7b8a4717047d23f48c39827cacad340