Skip to content

Commit 7052a18

Browse files
committed
Merge branch 'master' into esm
2 parents e0367b7 + 6fe2667 commit 7052a18

File tree

27 files changed

+179
-283
lines changed

27 files changed

+179
-283
lines changed

dist/node12/actions_python.67b034ac.js

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

dist/node12/actions_python.67b034ac.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/node12/setup-cpp.js

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

dist/node12/setup-cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/node16/actions_python.9a1d11b3.js

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

dist/node16/actions_python.9a1d11b3.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/node16/setup-cpp.js

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

dist/node16/setup-cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
"@actions/io": "^1.1.3",
6666
"@actions/tool-cache": "^2.0.1",
6767
"@babel/cli": "^7.21.0",
68-
"@npmcli/ci-detect": "^3.0.2",
6968
"@types/cross-spawn": "^6.0.2",
7069
"@types/eslint": "^8.37.0",
7170
"@types/jest": "^29.5.1",
@@ -78,14 +77,15 @@
7877
"@upleveled/babel-plugin-remove-node-prefix": "github:aminya/babel-plugin-remove-node-prefix#95fcbd92405b99a6eece48c493548996f12e6519",
7978
"admina": "^0.1.3",
8079
"caxa": "^3.0.1",
80+
"ci-info": "^3.8.0",
8181
"ci-log": "workspace:*",
8282
"cross-env": "7.0.3",
8383
"cross-spawn": "^7.0.3",
8484
"cspell": "^6.31.1",
8585
"escape-path-with-spaces": "^1.0.2",
8686
"escape-quotes": "^1.0.2",
8787
"escape-string-regexp": "^5.0.0",
88-
"eslint": "^8.38.0",
88+
"eslint": "^8.39.0",
8989
"eslint-config-atomic": "^1.18.3",
9090
"exec-powershell": "workspace:*",
9191
"execa": "^7.1.1",
@@ -152,7 +152,6 @@
152152
"semver": "7.3.8",
153153
"eslint": "^8.28.0",
154154
"prettier": "2.7.1",
155-
"lru-cache": "7.8.1",
156155
"core-js": "*",
157156
"babel-eslint": "npm:@babel/eslint-parser"
158157
},

packages/ci-log/src/index.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
import * as core from "@actions/core"
2-
import ciDetect from "@npmcli/ci-detect"
2+
import { GITHUB_ACTIONS } from "ci-info"
33

44
export function error(err: string | Error) {
5-
return ciDetect() === "github-actions" ? core.error(err) : console.log(`\x1b[31m${err}\x1b[0m`)
5+
return GITHUB_ACTIONS ? core.error(err) : console.log(`\x1b[31m${err}\x1b[0m`)
66
}
77

88
export function success(msg: string) {
99
return console.log(`\x1b[32m${msg}\x1b[0m`)
1010
}
1111

1212
export function warning(msg: string) {
13-
return ciDetect() === "github-actions" ? core.warning(msg) : console.log(`\x1b[33m${msg}\x1b[0m`)
13+
return GITHUB_ACTIONS ? core.warning(msg) : console.log(`\x1b[33m${msg}\x1b[0m`)
1414
}
1515

1616
export function notice(msg: string) {
17-
return ciDetect() === "github-actions" ? core.notice(msg) : console.log(`\x1b[94m${msg}\x1b[0m`)
17+
return GITHUB_ACTIONS ? core.notice(msg) : console.log(`\x1b[94m${msg}\x1b[0m`)
1818
}
1919

2020
export function info(msg: string) {
21-
return ciDetect() === "github-actions" ? core.info(msg) : console.log(msg)
21+
return GITHUB_ACTIONS ? core.info(msg) : console.log(msg)
2222
}

0 commit comments

Comments
 (0)