Skip to content

Commit 682ca30

Browse files
committed
fix: use utils/io instead of @actions/core
1 parent 5b1c9b8 commit 682ca30

File tree

6 files changed

+14
-18
lines changed

6 files changed

+14
-18
lines changed

src/gcc/gcc.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ import semverMajor from "semver/functions/major"
77
import semverCoerce from "semver/functions/coerce"
88
import { setupMacOSSDK } from "../macos-sdk/macos-sdk"
99
import path from "path"
10-
import { warning } from "../utils/io/io"
10+
import { warning, info } from "../utils/io/io"
1111
import { isGitHubCI } from "../utils/env/isci"
12-
import { info } from "@actions/core"
1312

1413
// eslint-disable-next-line @typescript-eslint/no-unused-vars
1514
export async function setupGcc(version: string, _setupDir: string, arch: string) {

src/llvm/llvm.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import { getSpecificVersionAndUrl, getVersions, semverCoerceIfInvalid } from "..
88
import { setupMacOSSDK } from "../macos-sdk/macos-sdk"
99
import { addBinExtension } from "../utils/extension/extension"
1010
import { addEnv } from "../utils/env/addEnv"
11-
import { info, setOutput } from "@actions/core"
11+
import { setOutput } from "@actions/core"
1212
import { setupAptPack, updateAptAlternatives } from "../utils/setup/setupAptPack"
13-
import { warning } from "../utils/io/io"
13+
import { info, warning } from "../utils/io/io"
1414
import { existsSync } from "fs"
1515
import { isGitHubCI } from "../utils/env/isci"
1616
import { setupGcc } from "../gcc/gcc"

src/main.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as core from "@actions/core"
1+
import { getInput, endGroup, startGroup } from "@actions/core"
22
import { setupBrew } from "./brew/brew"
33
import { setupCcache } from "./ccache/ccache"
44
import { setupMake } from "./make/make"
@@ -40,7 +40,6 @@ import { setupVCVarsall } from "./vcvarsall/vcvarsall"
4040
import { setupKcov } from "./kcov/kcov"
4141
import { addEnv } from "./utils/env/addEnv"
4242
import { setupSevenZip } from "./sevenzip/sevenzip"
43-
import { endGroup, startGroup } from "@actions/core"
4443
import { setupGraphviz } from "./graphviz/graphviz"
4544

4645
/** The setup functions */
@@ -218,7 +217,7 @@ export async function main(args: string[]): Promise<number> {
218217
}
219218
case "appleclang":
220219
case "applellvm": {
221-
core.info("Assuming apple-clang is already installed")
220+
info("Assuming apple-clang is already installed")
222221
addEnv("CC", "clang")
223222
addEnv("CXX", "clang++")
224223
successMessages.push(getSuccessMessage("apple-clang", undefined))
@@ -249,7 +248,7 @@ export async function main(args: string[]): Promise<number> {
249248
successMessages.forEach((tool) => success(tool))
250249
errorMessages.forEach((tool) => error(tool))
251250

252-
core.info("setup_cpp finished")
251+
info("setup_cpp finished")
253252

254253
if (!isGitHubCI()) {
255254
switch (process.platform) {
@@ -290,15 +289,15 @@ export function getCompilerInfo(maybeCompiler: string) {
290289
if (semverValid(maybeVersion) !== null) {
291290
return { compiler, version: maybeVersion }
292291
} else {
293-
core.info(`Invalid semver version ${maybeVersion} used for the compiler.`)
292+
info(`Invalid semver version ${maybeVersion} used for the compiler.`)
294293
return { compiler, version: maybeVersion }
295294
}
296295
}
297296
return { compiler, version: undefined }
298297
}
299298

300299
function printHelp() {
301-
core.info(`
300+
info(`
302301
setup_cpp [options]
303302
setup_cpp --compiler llvm --cmake true --ninja true --ccache true --vcpkg true
304303
@@ -340,7 +339,7 @@ All the available tools:
340339

341340
/** Get an object from github actions */
342341
function maybeGetInput(key: string) {
343-
const value = core.getInput(key.toLowerCase())
342+
const value = getInput(key.toLowerCase())
344343
if (value !== "false" && value !== "") {
345344
return value
346345
}

src/msvc/msvc.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
import { setupChocoPack } from "../utils/setup/setupChocoPack"
2-
import { info } from "@actions/core"
32
import { setupVCVarsall } from "../vcvarsall/vcvarsall"
43
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
54
// @ts-ignore
65
import { vsversion_to_versionnumber, findVcvarsall } from "msvc-dev-cmd/lib.js"
76
import { isGitHubCI } from "../utils/env/isci"
87
import path from "path"
98
import { existsSync } from "fs"
10-
import { error, warning } from "../utils/io/io"
9+
import { error, info, warning } from "../utils/io/io"
1110

1211
type MSVCVersion = "2022" | "17.0" | "2019" | "16.0" | "2017" | "15.0" | "2015" | "14.0" | "2013" | "12.0" | string
1312

src/python/python.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
import * as core from "@actions/core"
21
import { addPath } from "../utils/env/addEnv"
32
import { setupAptPack } from "../utils/setup/setupAptPack"
43
import { setupBrewPack } from "../utils/setup/setupBrewPack"
54
import { setupChocoPack } from "../utils/setup/setupChocoPack"
65
import { isGitHubCI } from "../utils/env/isci"
7-
import { warning } from "@actions/core"
6+
import { warning, info } from "../utils/io/io"
87

98
export async function setupPython(version: string, setupDir: string, arch: string) {
109
if (!isGitHubCI()) {
@@ -15,7 +14,7 @@ export async function setupPython(version: string, setupDir: string, arch: strin
1514
const { setupActionsPython } = await import("./actions_python")
1615
return setupActionsPython(version, setupDir, arch)
1716
} catch (err) {
18-
warning(err as Error)
17+
warning((err as Error).toString())
1918
return setupPythonViaSystem(version, setupDir, arch)
2019
}
2120
}
@@ -50,6 +49,6 @@ export function setupPythonViaSystem(version: string, setupDir: string, _arch: s
5049
}
5150

5251
function activateWinPython(binDir: string) {
53-
core.info(`Add ${binDir} to PATH`)
52+
info(`Add ${binDir} to PATH`)
5453
addPath(binDir)
5554
}

src/vcvarsall/vcvarsall.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { info } from "@actions/core"
21
import { existsSync } from "fs"
32
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
43
// @ts-ignore
54
import { setupMSVCDevCmd } from "msvc-dev-cmd/lib.js"
65
import { addEnv } from "../utils/env/addEnv"
6+
import { info } from "../utils/io/io"
77

88
function getArch(arch: string): string {
99
switch (arch) {

0 commit comments

Comments
 (0)