Merge branch 'canary' into update-react

vercel · Jun 6, 2023 · 6096173 · 6096173
2 parents 2787e24 + 452d390
commit 6096173
Show file tree

Hide file tree

Showing 8 changed files with 153 additions and 63 deletions.
diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
@@ -173,6 +173,7 @@ jobs:
       TURBO_TEAM: 'vercel'
       TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
       TURBO_REMOTE_ONLY: 'true'
+      DATADOG_API_KEY: ${{ secrets.DATA_DOG_API_KEY }}
     steps:
       # https://github.com/actions/virtual-environments/issues/1187
       - name: tune linux network
@@ -245,10 +246,10 @@ jobs:
       # Trying to upload metrics for the Turbopack to datadog's CI pipeline execution
       - name: 'Upload turbopack build metrics'
         shell: bash
-        if: ${{ needs.build.outputs.isRelease == 'true' }}
         continue-on-error: true
         run: |
           npm install -g @datadog/datadog-ci
+          shopt -s nullglob
           for filename in packages/next-swc/native/next-swc.*.node; do
             # Strip out filename to extract target triple
             export FILENAME=$(basename ${filename})