From 57d1ad563d0534d70f0b8170058a38c7f4ff8611 Mon Sep 17 00:00:00 2001 From: Jarmo Isotalo Date: Tue, 22 Dec 2020 13:00:18 +0200 Subject: [PATCH 1/3] chore(telemetry) improve github action and circle detection --- packages/gatsby-core-utils/src/ci.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/gatsby-core-utils/src/ci.ts b/packages/gatsby-core-utils/src/ci.ts index a69f117cbdea9..fdb1b9d52f426 100644 --- a/packages/gatsby-core-utils/src/ci.ts +++ b/packages/gatsby-core-utils/src/ci.ts @@ -8,6 +8,9 @@ const CI_DEFINITIONS = [ getEnvDetect({ key: `NOW_BUILDER`, name: `Vercel Now` }), getEnvDetect({ key: `VERCEL_BUILDER`, name: `Vercel Now` }), getEnvDetect({ key: `CODESANDBOX_SSE`, name: `CodeSandbox` }), + getEnvDetect({ key: `GITHUB_ACTIONS`, name: `GitHub Actions` }), + getEnvDetect({ key: `CIRCLE_BRANCH`, name: `CircleCI` }), + getEnvDetect({ key: `CIRCLECI`, name: `CircleCI` }), herokuDetect, getEnvFromCIInfo, envFromCIWithNoName, From 4ed521cdcd05d1ceab9aea5a933b27deb26dc862 Mon Sep 17 00:00:00 2001 From: Jarmo Isotalo Date: Tue, 22 Dec 2020 13:57:06 +0200 Subject: [PATCH 2/3] Change order --- packages/gatsby-core-utils/src/ci.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gatsby-core-utils/src/ci.ts b/packages/gatsby-core-utils/src/ci.ts index fdb1b9d52f426..94b40c3517376 100644 --- a/packages/gatsby-core-utils/src/ci.ts +++ b/packages/gatsby-core-utils/src/ci.ts @@ -1,7 +1,6 @@ import ci from "ci-info" const CI_DEFINITIONS = [ - envFromCIAndCIName, getEnvDetect({ key: `NOW_BUILDER_ANNOTATE`, name: `ZEIT Now` }), getEnvDetect({ key: `NOW_REGION`, name: `ZEIT Now v1` }), getEnvDetect({ key: `VERCEL_URL`, name: `Vercel Now` }), @@ -11,6 +10,7 @@ const CI_DEFINITIONS = [ getEnvDetect({ key: `GITHUB_ACTIONS`, name: `GitHub Actions` }), getEnvDetect({ key: `CIRCLE_BRANCH`, name: `CircleCI` }), getEnvDetect({ key: `CIRCLECI`, name: `CircleCI` }), + envFromCIAndCIName, herokuDetect, getEnvFromCIInfo, envFromCIWithNoName, From 3eab00ec97ab326f1e800eddb9b67eae1cbd2b0b Mon Sep 17 00:00:00 2001 From: Jarmo Isotalo Date: Tue, 22 Dec 2020 14:07:04 +0200 Subject: [PATCH 3/3] Make sure tests work in circle --- packages/gatsby-core-utils/src/__tests__/ci.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/gatsby-core-utils/src/__tests__/ci.ts b/packages/gatsby-core-utils/src/__tests__/ci.ts index cd6fd2cce435f..f618d09e9b4f9 100644 --- a/packages/gatsby-core-utils/src/__tests__/ci.ts +++ b/packages/gatsby-core-utils/src/__tests__/ci.ts @@ -9,6 +9,7 @@ describe(`CI detection`, () => { ;[ `CI`, `CIRCLECI`, + `CIRCLE_BRANCH`, `CIRCLE_PULL_REQUEST`, `SYSTEM_TEAMFOUNDATIONCOLLECTIONURI`, `SYSTEM_PULLREQUEST_PULLREQUESTID`,