Skip to content

Commit 0c956d8

Browse files
committed
Update golangci-lint
1 parent deae8e0 commit 0c956d8

9 files changed

Lines changed: 66 additions & 58 deletions

File tree

.github/workflows/push.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,10 @@ jobs:
3131
mkdir -p frontend/build
3232
echo "" > frontend/build/.gitkeep
3333
34-
- uses: golangci/golangci-lint-action@v4
34+
- uses: golangci/golangci-lint-action@v8
3535
with:
36-
version: v1.61
36+
version: v2.6
3737
only-new-issues: true
38-
skip-pkg-cache: true
39-
skip-build-cache: true
4038

4139
lint-frontend:
4240
runs-on: ubuntu-latest

.golangci.yml

Lines changed: 54 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,70 @@
1-
linters-settings:
2-
wrapcheck:
3-
ignorePackageGlobs:
4-
- github.com/satisfactorymodding/SatisfactoryModManager/*
5-
6-
govet:
7-
enable-all: true
8-
disable:
9-
- shadow
10-
- fieldalignment
11-
12-
gocritic:
13-
disabled-checks:
14-
- ifElseChain
15-
16-
gci:
17-
custom-order: true
18-
sections:
19-
- standard
20-
- default
21-
- prefix(github.com/satisfactorymodding/SatisfactoryModManager)
22-
- blank
23-
- dot
24-
25-
issues:
26-
exclude-rules:
27-
- linters:
28-
- typecheck
29-
text: "no matching files found"
30-
exclude-dirs:
31-
- frontend
32-
1+
version: "2"
332
run:
34-
timeout: 5m
353
build-tags:
364
- webkit2_41
37-
385
linters:
39-
disable-all: true
6+
default: none
407
enable:
41-
- errcheck
42-
- gosimple
43-
- govet
44-
- ineffassign
45-
- staticcheck
46-
- typecheck
47-
- unused
488
- bidichk
499
- contextcheck
5010
- durationcheck
11+
- errcheck
5112
- errorlint
5213
- goconst
53-
- goimports
54-
- revive
14+
- gocritic
15+
- govet
16+
- ineffassign
5517
- misspell
18+
- nonamedreturns
5619
- prealloc
20+
- revive
21+
- staticcheck
22+
- unused
5723
- whitespace
5824
- wrapcheck
25+
settings:
26+
gocritic:
27+
disabled-checks:
28+
- ifElseChain
29+
govet:
30+
disable:
31+
- shadow
32+
- fieldalignment
33+
enable-all: true
34+
wrapcheck:
35+
ignore-package-globs:
36+
- github.com/satisfactorymodding/SatisfactoryModManager/*
37+
revive:
38+
rules:
39+
- name: var-naming
40+
arguments:
41+
- [ ] # AllowList
42+
- [ ] # DenyList
43+
- - skip-package-name-checks: true
44+
exclusions:
45+
generated: lax
46+
presets:
47+
- comments
48+
- common-false-positives
49+
- legacy
50+
- std-error-handling
51+
paths:
52+
- frontend
53+
formatters:
54+
enable:
5955
- gci
60-
- gocritic
6156
- gofumpt
62-
- nonamedreturns
57+
- goimports
58+
settings:
59+
gci:
60+
sections:
61+
- standard
62+
- default
63+
- prefix(github.com/satisfactorymodding/SatisfactoryModManager)
64+
- blank
65+
- dot
66+
custom-order: true
67+
exclusions:
68+
generated: lax
69+
paths:
70+
- frontend

Taskfile.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ tasks:
6565
lint:
6666
silent: true
6767
preconditions:
68-
- golangci-lint --version | grep -q 1.61
68+
- golangci-lint --version | grep -q 2.6
6969
cmds:
7070
- GOOS=windows golangci-lint run
7171
- GOOS=linux golangci-lint run

backend/installfinders/launchers/crossover/crossover_darwin.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import (
66
"os"
77
"path/filepath"
88

9-
"github.com/satisfactorymodding/SatisfactoryModManager/backend/installfinders/launchers/epic"
109
"howett.net/plist"
1110

1211
"github.com/satisfactorymodding/SatisfactoryModManager/backend/installfinders/common"
1312
"github.com/satisfactorymodding/SatisfactoryModManager/backend/installfinders/launchers"
13+
"github.com/satisfactorymodding/SatisfactoryModManager/backend/installfinders/launchers/epic"
1414
"github.com/satisfactorymodding/SatisfactoryModManager/backend/installfinders/launchers/steam"
1515
)
1616

backend/installfinders/launchers/epic/epic_wine_unix.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ func FindInstallationsWine(winePrefix string, launcher string, launchPath []stri
1616
platform := common.WineLauncherPlatform(winePrefix)
1717

1818
if _, err := os.Stat(platform.ProcessPath(epicWineManifestPath)); os.IsNotExist(err) {
19-
return nil, []error{fmt.Errorf("Epic is not installed in %s", winePrefix)}
19+
return nil, []error{fmt.Errorf("epic is not installed in %s", winePrefix)}
2020
}
2121

2222
return FindInstallationsEpic(

backend/installfinders/launchers/steam/steam.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ import (
1212
"github.com/satisfactorymodding/SatisfactoryModManager/backend/installfinders/common"
1313
)
1414

15-
var manifests = []string{"appmanifest_526870.acf", "appmanifest_1690800.acf"}
16-
var steamappsCasings = []string{"steamapps", "SteamApps"}
15+
var (
16+
manifests = []string{"appmanifest_526870.acf", "appmanifest_1690800.acf"}
17+
steamappsCasings = []string{"steamapps", "SteamApps"}
18+
)
1719

1820
func FindInstallationsSteam(steamPath string, launcher string, platform common.LauncherPlatform) ([]*common.Installation, []error) {
1921
rawLibraryFolders := []string{steamPath}

backend/installfinders/launchers/steam/steam_wine_darwin.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func FindInstallationsWine(winePrefix string, launcher string, launchPath []stri
1717
platform := common.WineLauncherPlatform(winePrefix)
1818

1919
if _, err := os.Stat(platform.ProcessPath(steamWinePath)); os.IsNotExist(err) {
20-
return nil, []error{fmt.Errorf("Steam is not installed in %s", winePrefix)}
20+
return nil, []error{fmt.Errorf("steam is not installed in %s", winePrefix)}
2121
}
2222

2323
return FindInstallationsSteam(

backend/installfinders/launchers/whisky/whisky_darwin.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import (
77
"os"
88
"path/filepath"
99

10-
"github.com/satisfactorymodding/SatisfactoryModManager/backend/installfinders/launchers/epic"
1110
"howett.net/plist"
1211

1312
"github.com/satisfactorymodding/SatisfactoryModManager/backend/installfinders/common"
1413
"github.com/satisfactorymodding/SatisfactoryModManager/backend/installfinders/launchers"
14+
"github.com/satisfactorymodding/SatisfactoryModManager/backend/installfinders/launchers/epic"
1515
"github.com/satisfactorymodding/SatisfactoryModManager/backend/installfinders/launchers/steam"
1616
)
1717

build/windows/installer_version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,5 @@ func main() {
5858
}
5959

6060
_, _ = f.WriteString("# DO NOT EDIT - Generated automatically by build/windows/installer_version.go\n\n")
61-
_, _ = f.WriteString(fmt.Sprintf("!define VI_VERSION \"%s\"\n", version))
61+
_, _ = fmt.Fprintf(f, "!define VI_VERSION \"%s\"\n", version)
6262
}

0 commit comments

Comments
 (0)