Skip to content

Commit ceafc3b

Browse files
NaatanNaatan
authored
Merge pull request #3705 from ActiveState/CP-1034
Update windows runner to 2025
2 parents c145ffe + 7301bd9 commit ceafc3b

File tree

17 files changed

+92
-85
lines changed

17 files changed

+92
-85
lines changed

‎.github/workflows/build.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ jobs:
3838
go-version:
3939
- 1.23.8
4040
sys:
41-
- {os: ubuntu-latest}
42-
- {os: macos-13, shell: zsh}
43-
- {os: macos-latest, shell: zsh}
44-
- {os: windows-2019}
45-
- {os: ubuntu-24.04-arm}
41+
- { os: ubuntu-latest }
42+
- { os: macos-13, shell: zsh }
43+
- { os: macos-latest, shell: zsh }
44+
- { os: windows-2025 }
45+
- { os: ubuntu-24.04-arm }
4646
fail-fast: false
4747
runs-on: ${{ matrix.sys.os }}
4848
env:
@@ -249,13 +249,13 @@ jobs:
249249
shell: bash
250250
if: runner.os == 'Windows' && contains(fromJSON('["refs/heads/beta", "refs/heads/release", "refs/heads/LTS"]'), github.ref)
251251
run: |
252-
export PATH=/c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.11/bin/:/c/Program\ Files\ \(x86\)/Windows\ Kits/10/bin/10.0.16299.0/x86/:$PATH
252+
export PATH=/c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.14/bin/:/c/Program\ Files\ \(x86\)/Windows\ Kits/10/bin/10.0.26100.0/x64:$PATH
253253
254-
signtool.exe sign -d "ActiveState State Tool" -f "Cert.p12" -p ${CODE_SIGNING_PASSWD} ./build/state.exe
255-
signtool.exe sign -d "ActiveState State Service" -f "Cert.p12" -p ${CODE_SIGNING_PASSWD} ./build/state-svc.exe
256-
signtool.exe sign -d "ActiveState State Installer" -f "Cert.p12" -p ${CODE_SIGNING_PASSWD} ./build/state-installer.exe
257-
signtool.exe sign -d "ActiveState State Tool Remote Installer" -f "Cert.p12" -p ${CODE_SIGNING_PASSWD} ./build/state-remote-installer.exe
258-
signtool.exe sign -d "ActiveState State MCP" -f "Cert.p12" -p ${CODE_SIGNING_PASSWD} ./build/state-mcp.exe
254+
signtool.exe sign -fd SHA1 -d "ActiveState State Tool" -f "Cert.p12" -p ${CODE_SIGNING_PASSWD} ./build/state.exe
255+
signtool.exe sign -fd SHA1 -d "ActiveState State Service" -f "Cert.p12" -p ${CODE_SIGNING_PASSWD} ./build/state-svc.exe
256+
signtool.exe sign -fd SHA1 -d "ActiveState State Installer" -f "Cert.p12" -p ${CODE_SIGNING_PASSWD} ./build/state-installer.exe
257+
signtool.exe sign -fd SHA1 -d "ActiveState State Tool Remote Installer" -f "Cert.p12" -p ${CODE_SIGNING_PASSWD} ./build/state-remote-installer.exe
258+
signtool.exe sign -fd SHA1 -d "ActiveState State MCP" -f "Cert.p12" -p ${CODE_SIGNING_PASSWD} ./build/state-mcp.exe
259259
env:
260260
CODE_SIGNING_PASSWD: ${{ secrets.CODE_SIGNING_PASSWD }}
261261

@@ -536,5 +536,5 @@ jobs:
536536
session-build-ubuntu-latest
537537
session-build-macos-13
538538
session-build-macos-latest
539-
session-build-windows-2019
539+
session-build-windows-2025
540540
session-build-ubuntu-24.04-arm

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.23.7
55
require (
66
github.com/99designs/gqlgen v0.17.54
77
github.com/ActiveState/go-ogle-analytics v0.0.0-20170510030904-9b3f14901527
8-
github.com/ActiveState/termtest v0.7.3-0.20240703202616-34f7899287a4
8+
github.com/ActiveState/termtest v0.7.3-0.20250820165828-792af935fc74
99
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78
1010
github.com/alecthomas/participle/v2 v2.0.0
1111
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ github.com/ActiveState/go-ogle-analytics v0.0.0-20170510030904-9b3f14901527 h1:l
1919
github.com/ActiveState/go-ogle-analytics v0.0.0-20170510030904-9b3f14901527/go.mod h1:/9SyzKLlJSuIa7WAsLUUhHqTK9+PtZD8cKF8G4SLpa0=
2020
github.com/ActiveState/pty v0.0.0-20230628221854-6fb90eb08a14 h1:RdhhSiwmgyUaaF2GBNrbqTwE5SM+MaVjwf91Ua+CK8c=
2121
github.com/ActiveState/pty v0.0.0-20230628221854-6fb90eb08a14/go.mod h1:5mM6vNRQwshCjlkOnVpwC//4ZpkiC6nmZr8lPOxJdXs=
22-
github.com/ActiveState/termtest v0.7.3-0.20240703202616-34f7899287a4 h1:aYm+l6fT6sg+xEfO2+uSt0UJqw7WECwwqvSR7zaL/yI=
23-
github.com/ActiveState/termtest v0.7.3-0.20240703202616-34f7899287a4/go.mod h1:RyWp2NaaTrVAa+XjMHpKAqwBFWbL6wE12HQxiZNGAqU=
22+
github.com/ActiveState/termtest v0.7.3-0.20250820165828-792af935fc74 h1:bhx0C9Mh/03X/uHPBTZfv6Y2Js1ix0bT17qDDxaoTYk=
23+
github.com/ActiveState/termtest v0.7.3-0.20250820165828-792af935fc74/go.mod h1:RyWp2NaaTrVAa+XjMHpKAqwBFWbL6wE12HQxiZNGAqU=
2424
github.com/AlecAivazis/survey/v2 v2.0.5/go.mod h1:WYBhg6f0y/fNYUuesWQc0PKbJcEliGcYHB9sNT3Bg74=
2525
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=
2626
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=

‎internal/runbits/runtime/progress/progress.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ func NewRuntimeProgressIndicator(out output.Outputer) events.Handler {
9595
if out.Type() != output.PlainFormatName {
9696
w = nil
9797
}
98-
if out.Config().Interactive {
98+
if os.Getenv("DOTPROGRESS") == "" && out.Config().Interactive {
9999
return newProgressIndicator(w, out)
100100
}
101101
return newDotProgressIndicator(out)

‎internal/runners/clean/run_win.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,19 @@ func (u *Uninstall) runUninstall(params *UninstallParams) error {
3232
logFile, err := os.CreateTemp("", "state-clean-uninstall")
3333
if err != nil {
3434
logging.Error("Could not create temporary log file: %s", errs.JoinMessage(err))
35-
aggErr = locale.WrapError(aggErr, "err_clean_logfile", "Could not create temporary log file")
35+
aggErr = locale.WrapError(aggErr, "err_clean_logfile", "Could not create temporary log file: {{.V0}}", err.Error())
3636
}
3737

3838
stateExec, err := installation.StateExec()
3939
if err != nil {
4040
logging.Debug("Could not get State Tool executable: %s", errs.JoinMessage(err))
41-
aggErr = locale.WrapError(aggErr, "err_state_exec")
41+
aggErr = locale.WrapError(aggErr, "err_state_exec_with_error", "Could not get State Tool executable: {{.V0}}", err.Error())
4242
}
4343

4444
err = removeInstall(logFile.Name(), params, u.cfg)
4545
if err != nil {
4646
logging.Debug("Could not remove installation: %s", errs.JoinMessage(err))
47-
aggErr = locale.WrapError(aggErr, "uninstall_remove_executables_err", "Failed to remove all State Tool files in installation directory {{.V0}}", filepath.Dir(stateExec))
47+
aggErr = locale.WrapError(aggErr, "uninstall_remove_executables_err", "Failed to remove all State Tool files in installation directory {{.V0}}: {{.V1}}", filepath.Dir(stateExec), err.Error())
4848
}
4949

5050
err = removeApp()

‎internal/testhelpers/tagsuite/tagsuite.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ const (
2929
Config = "config"
3030
Critical = "critical"
3131
Cve = "cve"
32+
Debug = "debug"
3233
DeleteProjects = "delete-uuid-projects"
3334
Deploy = "deploy"
3435
Edit = "edit"

‎test/integration/analytics_int_test.go‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ import (
1010
"testing"
1111
"time"
1212

13+
"github.com/ActiveState/termtest"
14+
"github.com/thoas/go-funk"
15+
1316
"github.com/ActiveState/cli/internal/runbits/runtime/trigger"
1417
"github.com/ActiveState/cli/internal/testhelpers/suite"
15-
"github.com/thoas/go-funk"
1618

1719
"github.com/ActiveState/cli/internal/analytics/client/sync/reporters"
1820
anaConst "github.com/ActiveState/cli/internal/analytics/constants"
@@ -463,7 +465,7 @@ func (suite *AnalyticsIntegrationTestSuite) TestInputError() {
463465
}
464466

465467
func (suite *AnalyticsIntegrationTestSuite) TestAttempts() {
466-
suite.OnlyRunForTags(tagsuite.Analytics)
468+
suite.OnlyRunForTags(tagsuite.Critical, tagsuite.Analytics)
467469

468470
ts := e2e.New(suite.T(), false)
469471
defer ts.Close()
@@ -473,7 +475,8 @@ func (suite *AnalyticsIntegrationTestSuite) TestAttempts() {
473475
cp := ts.SpawnWithOpts(
474476
e2e.OptArgs("activate", "ActiveState-CLI/Alternate-Python"),
475477
e2e.OptWD(ts.Dirs.Work),
476-
e2e.OptAppendEnv(constants.DisableActivateEventsEnvVarName+"=false"),
478+
e2e.OptAppendEnv(constants.DisableActivateEventsEnvVarName+"=false", "DOTPROGRESS=true"),
479+
e2e.OptTermTest(termtest.OptVerboseLogger()),
477480
)
478481

479482
cp.Expect("Creating a Virtual Environment")

‎test/integration/branch_int_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func (suite *BranchIntegrationTestSuite) TestBranch_List() {
2222

2323
ts.PrepareProject("ActiveState-CLI/Branches", "35af7414-b44b-4fd7-aa93-2ecad337ed2b")
2424

25-
cp := ts.SpawnWithOpts(e2e.OptArgs("branch"), e2e.OptTermTest(termtest.OptVerboseLogger()))
25+
cp := ts.SpawnWithOpts(e2e.OptArgs("branch"))
2626
// Sometimes there's a space before the line break, unsure exactly why, but hence the regex
2727
cp.ExpectRe(`main \(Current\)\s?\n ├─ firstbranch\s?\n │ └─ firstbranchchild\s?\n │ └─ childoffirstbranchchild\s?\n ├─ secondbranch\s?\n └─ thirdbranch`, termtest.OptExpectTimeout(5*time.Second))
2828
cp.Expect("To switch to another branch,")

‎test/integration/errors_int_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,35 +17,35 @@ func (suite *ErrorsIntegrationTestSuite) TestTips() {
1717
suite.OnlyRunForTags(tagsuite.Errors, tagsuite.Critical)
1818
ts := e2e.New(suite.T(), false)
1919
defer ts.Close()
20+
ts.IgnoreLogErrors()
2021

2122
cp := ts.Spawn("__test", "multierror")
2223
cp.Expect("Need More Help?")
2324
cp.Expect("Run →")
2425
cp.Expect("Ask For Help →")
2526
cp.ExpectExitCode(1)
26-
ts.IgnoreLogErrors()
2727
}
2828

2929
func (suite *ErrorsIntegrationTestSuite) TestMultiErrorWithInput() {
3030
suite.OnlyRunForTags(tagsuite.Errors, tagsuite.Critical)
3131
ts := e2e.New(suite.T(), false)
3232
defer ts.Close()
33+
ts.IgnoreLogErrors()
3334

34-
cp := ts.Spawn("__test", "multierror-input")
35-
cp.ExpectRe(`\s+x error1.\s+\s+x error2.\s+x error3.\s+x error4.\s+█\s+Need More Help`)
35+
cp := ts.SpawnWithOpts(e2e.OptArgs("__test", "multierror-input"))
36+
cp.ExpectRe(`x error1.\s+\s+x error2.\s+x error3.\s+x error4.`)
3637
cp.ExpectExitCode(1)
37-
ts.IgnoreLogErrors()
3838
}
3939

4040
func (suite *ErrorsIntegrationTestSuite) TestMultiErrorWithoutInput() {
4141
suite.OnlyRunForTags(tagsuite.Errors, tagsuite.Critical)
4242
ts := e2e.New(suite.T(), false)
4343
defer ts.Close()
44+
ts.IgnoreLogErrors()
4445

45-
cp := ts.Spawn("__test", "multierror-noinput")
46-
cp.ExpectRe(`\s+x error1.\s+\s+x error2.\s+x error3.\s+x error4.\s+█\s+Need More Help`)
46+
cp := ts.SpawnWithOpts(e2e.OptArgs("__test", "multierror-noinput"))
47+
cp.ExpectRe(`x error1.\s+\s+x error2.\s+x error3.\s+x error4.`)
4748
cp.ExpectExitCode(1)
48-
ts.IgnoreLogErrors()
4949
}
5050

5151
func TestErrorsIntegrationTestSuite(t *testing.T) {

‎test/integration/hello_int_example_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ func (suite *HelloIntegrationTestSuite) TestHello() {
3030
ts.IgnoreLogErrors()
3131

3232
cp = ts.Spawn("_hello", "Person", "--extra")
33-
cp.Expect("Project: ActiveState-CLI/Empty")
34-
cp.Expect("Current commit message:")
33+
cp.Expect("You are on commit")
3534
cp.ExpectExitCode(0)
3635

3736
cp = ts.Spawn("_hello", "Person", "--echo", "example")

0 commit comments

Comments
 (0)