Skip to content

Commit b62737d

Browse files
refactor: replace is-ci with ci-info to detect additional envs (like Azure) (#9117)
1 parent bacc6b4 commit b62737d

File tree

10 files changed

+31
-30
lines changed

10 files changed

+31
-30
lines changed

.changeset/many-toys-yell.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"app-builder-lib": patch
3+
"builder-util": patch
4+
"electron-builder": patch
5+
---
6+
7+
chore(deps): replace `is-ci` with `ci-info`

packages/app-builder-lib/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
"builder-util": "workspace:*",
6060
"builder-util-runtime": "workspace:*",
6161
"chromium-pickle-js": "^0.2.0",
62+
"ci-info": "^4.2.0",
6263
"config-file-ts": "0.2.8-rc1",
6364
"debug": "^4.3.4",
6465
"dotenv": "^16.4.5",
@@ -67,7 +68,6 @@
6768
"electron-publish": "workspace:*",
6869
"fs-extra": "^10.1.0",
6970
"hosted-git-info": "^4.1.0",
70-
"is-ci": "^3.0.0",
7171
"isbinaryfile": "^5.0.0",
7272
"js-yaml": "^4.1.0",
7373
"json5": "^2.2.3",
@@ -104,7 +104,6 @@
104104
"@types/debug": "4.1.7",
105105
"@types/ejs": "3.1.0",
106106
"@types/hosted-git-info": "3.0.2",
107-
"@types/is-ci": "3.0.0",
108107
"@types/js-yaml": "4.0.3",
109108
"@types/plist": "3.0.5",
110109
"@types/semver": "7.3.8",

packages/app-builder-lib/src/packager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
} from "builder-util"
1818
import { CancellationToken } from "builder-util-runtime"
1919
import { chmod, mkdirs, outputFile } from "fs-extra"
20-
import * as isCI from "is-ci"
20+
import { isCI } from "ci-info"
2121
import { Lazy } from "lazy-val"
2222
import { release as getOsRelease } from "os"
2323
import * as path from "path"

packages/app-builder-lib/src/publish/PublishManager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import {
2828
} from "electron-publish"
2929
import { MultiProgress } from "electron-publish/out/multiProgress"
3030
import { writeFile } from "fs/promises"
31-
import * as isCi from "is-ci"
31+
import * as isCi from "ci-info"
3232
import * as path from "path"
3333
import { WriteStream as TtyWriteStream } from "tty"
3434
import * as url from "url"

packages/app-builder-lib/src/winPackager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Arch, CopyFileTransformer, executeAppBuilder, FileTransformer, InvalidC
22
import { Nullish } from "builder-util-runtime"
33
import { createHash } from "crypto"
44
import { readdir } from "fs/promises"
5-
import * as isCI from "is-ci"
5+
import { isCI } from "ci-info"
66
import { Lazy } from "lazy-val"
77
import * as path from "path"
88
import { SignManager } from "./codeSign/signManager"

packages/builder-util/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
"app-builder-bin": "5.0.0-alpha.12",
2121
"builder-util-runtime": "workspace:*",
2222
"chalk": "^4.1.2",
23+
"ci-info": "^4.2.0",
2324
"cross-spawn": "^7.0.6",
2425
"debug": "^4.3.4",
2526
"fs-extra": "^10.1.0",
2627
"http-proxy-agent": "^7.0.0",
2728
"https-proxy-agent": "^7.0.0",
28-
"is-ci": "^3.0.0",
2929
"js-yaml": "^4.1.0",
3030
"sanitize-filename": "^1.6.3",
3131
"source-map-support": "^0.5.19",
@@ -37,7 +37,6 @@
3737
"devDependencies": {
3838
"@types/cross-spawn": "6.0.6",
3939
"@types/fs-extra": "^9.0.11",
40-
"@types/is-ci": "3.0.0",
4140
"@types/js-yaml": "4.0.3",
4241
"@types/source-map-support": "0.5.4",
4342
"@types/tiny-async-pool": "^1.0.5"

packages/builder-util/src/fs.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Nullish } from "builder-util-runtime"
22
import { Stats } from "fs"
33
import { copyFile as _nodeCopyFile } from "fs-extra"
44
import { access, chmod, link, lstat, mkdir, readdir, readlink, stat, symlink, unlink, writeFile } from "fs/promises"
5-
import * as isCI from "is-ci"
5+
import { isCI } from "ci-info"
66
import { platform } from "os"
77
import * as path from "path"
88
import { Mode } from "stat-mode"

packages/electron-builder/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,15 @@
5555
"builder-util": "workspace:*",
5656
"builder-util-runtime": "workspace:*",
5757
"chalk": "^4.1.2",
58+
"ci-info": "^4.2.0",
5859
"dmg-builder": "workspace:*",
5960
"fs-extra": "^10.1.0",
60-
"is-ci": "^3.0.0",
6161
"lazy-val": "^1.0.5",
6262
"simple-update-notifier": "2.0.0",
6363
"yargs": "^17.6.2"
6464
},
6565
"devDependencies": {
6666
"@types/fs-extra": "9.0.13",
67-
"@types/is-ci": "3.0.0",
6867
"@types/yargs": "^17.0.16"
6968
},
7069
"typings": "./out/index.d.ts",

packages/electron-builder/src/cli/cli.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { nodeGypRebuild } from "app-builder-lib/out/util/yarn"
66
import { ExecError, InvalidConfigurationError, log } from "builder-util"
77
import * as chalk from "chalk"
88
import { readJson } from "fs-extra"
9-
import * as isCi from "is-ci"
9+
import { isCI } from "ci-info"
1010
import * as path from "path"
1111
import { build, configureBuildCommand, createYargs } from "../builder"
1212
import { configurePublishCommand, publish } from "../publish"
@@ -64,7 +64,7 @@ function wrap(task: (args: any) => Promise<any>) {
6464
}
6565

6666
async function checkIsOutdated() {
67-
if (isCi || process.env.NO_UPDATE_NOTIFIER != null) {
67+
if (isCI || process.env.NO_UPDATE_NOTIFIER != null) {
6868
return
6969
}
7070

pnpm-lock.yaml

Lines changed: 15 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)