chore: skip Circle env canary check unless in Docker (#23467)

cypress-io · Aug 19, 2022 · 6e18996 · 6e18996 · cypress-bot · Aug 19, 2022
1 parent 97551d7
commit 6e18996
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/circle.yml b/circle.yml
@@ -78,6 +78,7 @@ executors:
     resource_class: medium
     environment:
       PLATFORM: linux
+      CI_DOCKER: "true"
 
   # Docker image with non-root "node" user
   non-root-docker-user:
@@ -1200,8 +1201,10 @@ jobs:
       - run:
           name: Check env canaries on Linux
           command: |
-            # Windows/Mac M1 CircleCI does not have a way to pull per-job env
-            [[ $PLATFORM == 'linux' ]] && node ./scripts/circle-env.js --check-canaries || true
+            # only Docker has the required env data for this
+            if [[ $CI_DOCKER == 'true' ]]; then
+              node ./scripts/circle-env.js --check-canaries
+            fi
       - build-and-persist
       - store-npm-logs
 

diff --git a/scripts/verify-mocha-results.js b/scripts/verify-mocha-results.js
@@ -83,7 +83,7 @@ async function checkReportFiles (filenames) {
     circleEnv = await readCircleEnv()
   } catch (err) {
     // set SKIP_CIRCLE_ENV to bypass, for local development
-    if (!process.env.SKIP_CIRCLE_ENV) throw err
+    if (!process.env.SKIP_CIRCLE_ENV && process.env.CI_DOCKER) throw err
 
     circleEnv = {}
   }