Unverified Commit 37a50cd3 authored by Joe Haddad's avatar Joe Haddad Committed by GitHub

Add support for ZEIT Now CI detection (#8864)

* Add support for ZEIT Now CI detection

* Add isNowDev to meta fields
parent ebf1fe3d
import ciEnvironment from 'ci-info'
import isDockerFunction from 'is-docker' import isDockerFunction from 'is-docker'
import os from 'os' import os from 'os'
import * as ciEnvironment from './ci-info'
type AnonymousMeta = { type AnonymousMeta = {
systemPlatform: NodeJS.Platform systemPlatform: NodeJS.Platform
systemRelease: string systemRelease: string
...@@ -11,6 +12,7 @@ type AnonymousMeta = { ...@@ -11,6 +12,7 @@ type AnonymousMeta = {
cpuSpeed: number | null cpuSpeed: number | null
memoryInMb: number memoryInMb: number
isDocker: boolean isDocker: boolean
isNowDev: boolean
isCI: boolean isCI: boolean
ciName: string | null ciName: string | null
} }
...@@ -23,6 +25,7 @@ export function getAnonymousMeta(): AnonymousMeta { ...@@ -23,6 +25,7 @@ export function getAnonymousMeta(): AnonymousMeta {
} }
const cpus = os.cpus() || [] const cpus = os.cpus() || []
const { NOW_REGION } = process.env
traits = { traits = {
// Software information // Software information
systemPlatform: os.platform(), systemPlatform: os.platform(),
...@@ -35,6 +38,7 @@ export function getAnonymousMeta(): AnonymousMeta { ...@@ -35,6 +38,7 @@ export function getAnonymousMeta(): AnonymousMeta {
memoryInMb: Math.trunc(os.totalmem() / Math.pow(1024, 2)), memoryInMb: Math.trunc(os.totalmem() / Math.pow(1024, 2)),
// Environment information // Environment information
isDocker: isDockerFunction(), isDocker: isDockerFunction(),
isNowDev: NOW_REGION === 'dev1',
isCI: ciEnvironment.isCI, isCI: ciEnvironment.isCI,
ciName: (ciEnvironment.isCI && ciEnvironment.name) || null, ciName: (ciEnvironment.isCI && ciEnvironment.name) || null,
} }
......
import ciEnvironment from 'ci-info'
const { isCI: _isCI, name: _name } = ciEnvironment
const isZeitNow = !!process.env.NOW_BUILDER
export const isCI = isZeitNow || _isCI
export const name = isZeitNow ? 'ZEIT Now' : _name
import chalk from 'chalk' import chalk from 'chalk'
import ciEnvironment from 'ci-info'
import Conf from 'conf' import Conf from 'conf'
import { BinaryLike, createHash, randomBytes } from 'crypto' import { BinaryLike, createHash, randomBytes } from 'crypto'
import findUp from 'find-up' import findUp from 'find-up'
...@@ -7,6 +6,7 @@ import isDockerFunction from 'is-docker' ...@@ -7,6 +6,7 @@ import isDockerFunction from 'is-docker'
import path from 'path' import path from 'path'
import { getAnonymousMeta } from './anonymous-meta' import { getAnonymousMeta } from './anonymous-meta'
import * as ciEnvironment from './ci-info'
import { _postPayload } from './post-payload' import { _postPayload } from './post-payload'
import { getProjectId } from './project-id' import { getProjectId } from './project-id'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment