Skip to content

Commit 559cee9

Browse files
committed
chore: update implementation
1 parent f0048dc commit 559cee9

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

src/install.ts

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as core from "@actions/core"
22
import * as tc from "@actions/tool-cache"
3-
import { exec, ExecOptions } from "child_process"
3+
import { exec, ExecOptionsWithStringEncoding } from "child_process"
44
import os from "os"
55
import path from "path"
66
import { promisify } from "util"
@@ -82,7 +82,7 @@ async function goInstall(versionInfo: VersionInfo): Promise<string> {
8282

8383
const startedAt = Date.now()
8484

85-
const options: ExecOptions = { env: { ...process.env, CGO_ENABLED: "1" } }
85+
const options: ExecOptionsWithStringEncoding = { env: { ...process.env, CGO_ENABLED: "1" } }
8686

8787
const exres = await execShellCommand(
8888
`go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@${versionInfo.TargetVersion}`,
@@ -160,21 +160,20 @@ function getAssetURL(versionInfo: VersionInfo): string {
160160
break
161161
}
162162

163-
let arch = os.arch()
164-
switch (arch) {
163+
let platformArch = "amd64"
164+
switch (os.arch()) {
165165
case "arm64":
166-
arch = "arm64"
166+
platformArch = "arm64"
167167
break
168168
case "x64":
169-
arch = "amd64"
169+
platformArch = "amd64"
170170
break
171-
case "x32":
172171
case "ia32":
173-
arch = "386"
172+
platformArch = "386"
174173
break
175174
}
176175

177176
const noPrefix = versionInfo.TargetVersion.slice(1)
178177

179-
return `https://github.com/golangci/golangci-lint/releases/download/${versionInfo.TargetVersion}/golangci-lint-${noPrefix}-${platform}-${arch}.${ext}`
178+
return `https://github.com/golangci/golangci-lint/releases/download/${versionInfo.TargetVersion}/golangci-lint-${noPrefix}-${platform}-${platformArch}.${ext}`
180179
}

src/run.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as core from "@actions/core"
22
import * as github from "@actions/github"
3-
import { exec, ExecOptions } from "child_process"
3+
import { exec, ExecOptionsWithStringEncoding } from "child_process"
44
import * as fs from "fs"
55
import * as path from "path"
66
import { promisify } from "util"
@@ -116,7 +116,7 @@ async function runLint(binPath: string, patchPath: string): Promise<void> {
116116
}
117117
}
118118

119-
const cmdArgs: ExecOptions = {}
119+
const cmdArgs: ExecOptionsWithStringEncoding = {}
120120

121121
const workingDirectory = core.getInput(`working-directory`)
122122
if (workingDirectory) {
@@ -156,7 +156,7 @@ async function runLint(binPath: string, patchPath: string): Promise<void> {
156156
core.info(`Ran golangci-lint in ${Date.now() - startedAt}ms`)
157157
}
158158

159-
async function runVerify(binPath: string, userArgsMap: Map<string, string>, cmdArgs: ExecOptions): Promise<void> {
159+
async function runVerify(binPath: string, userArgsMap: Map<string, string>, cmdArgs: ExecOptionsWithStringEncoding): Promise<void> {
160160
const verify = core.getBooleanInput(`verify`, { required: true })
161161
if (!verify) {
162162
return
@@ -178,7 +178,7 @@ async function runVerify(binPath: string, userArgsMap: Map<string, string>, cmdA
178178
printOutput(res)
179179
}
180180

181-
async function getConfigPath(binPath: string, userArgsMap: Map<string, string>, cmdArgs: ExecOptions): Promise<string> {
181+
async function getConfigPath(binPath: string, userArgsMap: Map<string, string>, cmdArgs: ExecOptionsWithStringEncoding): Promise<string> {
182182
let cmdConfigPath = `${binPath} config path`
183183
if (userArgsMap.get("config")) {
184184
cmdConfigPath += ` --config=${userArgsMap.get("config")}`

0 commit comments

Comments
 (0)