Skip to content

Commit dc9fded

Browse files
MDrakosMDrakos
committed
Merge branch 'master' into miked/CP-964
2 parents dbdf3bb + 8a6848c commit dc9fded

File tree

6 files changed

+69
-59
lines changed

6 files changed

+69
-59
lines changed

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
strategy:
3838
matrix:
3939
go-version:
40-
- 1.24.6
40+
- 1.24.11
4141
sys:
4242
- { os: ubuntu-latest }
4343
- { os: macos-15-intel, shell: zsh }
@@ -444,7 +444,7 @@ jobs:
444444
name: Install Go
445445
uses: actions/setup-go@v5
446446
with:
447-
go-version: 1.23.x
447+
go-version: 1.24.x
448448

449449
- # === Install State Tool ===
450450
name: Install State Tool

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
name: Install Go
3232
uses: actions/setup-go@v5
3333
with:
34-
go-version: '1.23.x'
34+
go-version: '1.24.x'
3535

3636
- # === Install State Tool ===
3737
name: Install State Tool

‎.golangci.yaml‎

Lines changed: 57 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,57 @@
1-
issues:
2-
exclude-dirs:
3-
- vendor
4-
exclude-rules:
5-
- linters:
6-
- staticcheck
7-
text: "SA9004"
8-
9-
linters-settings:
10-
errcheck:
11-
exclude-functions:
12-
- fmt.Fprintln
13-
- (*github.com/ActiveState/termtest.TermTest).Expect
14-
- (*github.com/ActiveState/termtest.TermTest).ExpectExitCode
15-
- (*github.com/ActiveState/termtest.TermTest).ExpectNotExitCode
16-
- (*github.com/ActiveState/termtest.TermTest).ExpectRe
17-
- (*github.com/ActiveState/termtest.TermTest).Expect
18-
- (*github.com/ActiveState/termtest.TermTest).WaitForInput
19-
- (*github.com/ActiveState/termtest.TermTest).SendLine
20-
- (*github.com/ActiveState/termtest.TermTest).ExpectInput
21-
- (*github.com/ActiveState/termtest.TermTest).ExpectExit
22-
- (*github.com/ActiveState/termtest.TermTest).Wait
23-
- (*github.com/ActiveState/logging.fileHandler).Printf
24-
- (*github.com/ActiveState/logging.standardHandler).Printf
25-
- (*github.com/ActiveState/cli/internal/testhelpers/e2e.Session).Close
26-
- (*github.com/ActiveState/cli/internal/testhelpers/e2e.SpawnedCmd).ExpectInput
27-
- (*github.com/ActiveState/cli/internal/testhelpers/e2e.SpawnedCmd).Send
28-
- (*github.com/ActiveState/cli/internal/testhelpers/e2e.SpawnedCmd).SendLine
29-
- (*github.com/ActiveState/cli/internal/testhelpers/e2e.SpawnedCmd).SendEnter
30-
- (*github.com/ActiveState/cli/internal/testhelpers/e2e.SpawnedCmd).SendKeyDown
31-
- (*github.com/ActiveState/cli/internal/testhelpers/e2e.SpawnedCmd).ExpectRe
32-
- (*github.com/ActiveState/cli/internal/testhelpers/e2e.SpawnedCmd).Wait
33-
- (*github.com/ActiveState/cli/internal/testhelpers/e2e.Session).ClearCache
34-
- (*github.com/ActiveState/cli/internal/testhelpers/e2e.Dirs).Close
35-
- github.com/ActiveState/cli/internal/testhelpers/osutil.RemoveConfigFile
36-
- (*github.com/ActiveState/cli/internal/logging.standardHandler).Emit
37-
- (*github.com/ActiveState/cli/internal/logging.fileHandler).Emit
38-
govet:
39-
disable:
40-
- composites
41-
42-
# When issues occur with linting us the snippet below to help with debugging
43-
# linters:
44-
# # Disable all and re-enable the default linters as a starting point.
45-
# disable-all: true
46-
# enable:
47-
# - errcheck
48-
# - gosimple
49-
# - govet
50-
# - ineffassign
51-
# - staticcheck
52-
# - typecheck
53-
# - unused
1+
version: "2"
2+
linters:
3+
settings:
4+
errcheck:
5+
exclude-functions:
6+
- fmt.Fprintln
7+
- (*github.com/ActiveState/termtest.TermTest).Expect
8+
- (*github.com/ActiveState/termtest.TermTest).ExpectExitCode
9+
- (*github.com/ActiveState/termtest.TermTest).ExpectNotExitCode
10+
- (*github.com/ActiveState/termtest.TermTest).ExpectRe
11+
- (*github.com/ActiveState/termtest.TermTest).Expect
12+
- (*github.com/ActiveState/termtest.TermTest).WaitForInput
13+
- (*github.com/ActiveState/termtest.TermTest).SendLine
14+
- (*github.com/ActiveState/termtest.TermTest).ExpectInput
15+
- (*github.com/ActiveState/termtest.TermTest).ExpectExit
16+
- (*github.com/ActiveState/termtest.TermTest).Wait
17+
- (*github.com/ActiveState/logging.fileHandler).Printf
18+
- (*github.com/ActiveState/logging.standardHandler).Printf
19+
- (*github.com/ActiveState/cli/internal/testhelpers/e2e.Session).Close
20+
- (*github.com/ActiveState/cli/internal/testhelpers/e2e.SpawnedCmd).ExpectInput
21+
- (*github.com/ActiveState/cli/internal/testhelpers/e2e.SpawnedCmd).Send
22+
- (*github.com/ActiveState/cli/internal/testhelpers/e2e.SpawnedCmd).SendLine
23+
- (*github.com/ActiveState/cli/internal/testhelpers/e2e.SpawnedCmd).SendEnter
24+
- (*github.com/ActiveState/cli/internal/testhelpers/e2e.SpawnedCmd).SendKeyDown
25+
- (*github.com/ActiveState/cli/internal/testhelpers/e2e.SpawnedCmd).ExpectRe
26+
- (*github.com/ActiveState/cli/internal/testhelpers/e2e.SpawnedCmd).Wait
27+
- (*github.com/ActiveState/cli/internal/testhelpers/e2e.Session).ClearCache
28+
- (*github.com/ActiveState/cli/internal/testhelpers/e2e.Dirs).Close
29+
- github.com/ActiveState/cli/internal/testhelpers/osutil.RemoveConfigFile
30+
- (*github.com/ActiveState/cli/internal/logging.standardHandler).Emit
31+
- (*github.com/ActiveState/cli/internal/logging.fileHandler).Emit
32+
govet:
33+
disable:
34+
- composites
35+
exclusions:
36+
generated: lax
37+
presets:
38+
- comments
39+
- common-false-positives
40+
- legacy
41+
- std-error-handling
42+
rules:
43+
- linters:
44+
- staticcheck
45+
text: SA9004
46+
paths:
47+
- vendor
48+
- third_party$
49+
- builtin$
50+
- examples$
51+
formatters:
52+
exclusions:
53+
generated: lax
54+
paths:
55+
- third_party$
56+
- builtin$
57+
- examples$

‎activestate.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ scripts:
5555
if: ne .Shell "cmd"
5656
value: |
5757
if ! type "go" &> /dev/null; then
58-
echo "go is not installed. Please install Go version 1.23 or above."
58+
echo "go is not installed. Please install Go version 1.24 or above."
5959
exit 1
6060
fi
6161
if ! type "golangci-lint" &> /dev/null; then
6262
echo "golangci-lint was not found on your PATH. Installing .."
63-
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.59.1
63+
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v2.6.2
6464
fi
6565
git config core.hooksPath .githooks
6666
if ! type "swagger" &> /dev/null; then

‎changelog.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to
77
[Semantic Versioning](https://semver.org/spec/v2.0.0.html).
88

9+
## 0.48.1
10+
11+
### Security
12+
13+
Addressed all known, fixable CVEs.
14+
915
## 0.48.0
1016

1117
### Added

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/ActiveState/cli
22

3-
go 1.24.9
3+
go 1.24.11
44

55
require (
66
github.com/99designs/gqlgen v0.17.54

0 commit comments

Comments
 (0)