chore(telemetry) improve github action and circle detection (#28732) (#28747)

* chore(telemetry) improve github action and circle detection

* Change order

* Make sure tests work in circle

(cherry picked from commit 3af7182)

Co-authored-by: Jarmo Isotalo <[email protected]>

Author: GatsbyJS Bot

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`,

packages/gatsby-core-utils/src/ci.ts

@@ -1,13 +1,16 @@
 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` }),
   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` }),
+  envFromCIAndCIName,
   herokuDetect,
   getEnvFromCIInfo,
   envFromCIWithNoName,