Nonononono

.github/workflows/build.yml

@@ -32,25 +32,25 @@ jobs:
 
   # === OS Specific Job (runs on each OS) ===
   os_specific:
-    name: ${{ matrix.platform }}
+    name: ${{ matrix.sys.os }}
     timeout-minutes: 90
     strategy:
       matrix:
         go-version:
           - 1.20.x
-        platform:
-          - ubuntu-20.04
-          - macos-11
-          - windows-2019
+        sys:
+          - {os: ubuntu-20.04}
+          - {os: macos-11, shell: zsh}
+          - {os: windows-2019}
       fail-fast: false
-    runs-on: ${{ matrix.platform }}
+    runs-on: ${{ matrix.sys.os }}
     env:
       ACTIVESTATE_CI: true
       ACTIVESTATE_CLI_DISABLE_RUNTIME: true
       SHELL: bash
       GITHUB_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     concurrency:
-      group: ${{ github.ref }}-${{ github.event_name }}-${{ matrix.platform }}
+      group: ${{ github.ref }}-${{ github.event_name }}-${{ matrix.sys.os }}
       cancel-in-progress: true
 
     # === OS Specific Steps ===
@@ -326,7 +326,7 @@ jobs:
           if [[ "$TEST_SUITE_TAGS" == "all" ]]; then
             TIMEOUT=60m
           fi
-          SHELL='' go test -timeout $TIMEOUT -v `go list ./... | grep "integration"` -json 2>&1 | gotestfmt -hide empty-packages
+          SHELL='${{ matrix.sys.shell }}' go test -timeout $TIMEOUT -v `go list ./... | grep "integration"` -json 2>&1 | gotestfmt -hide empty-packages
         continue-on-error: ${{ github.event_name == 'schedule' }}
         env:
           INTEGRATION_TEST_USERNAME: ${{ secrets.INTEGRATION_TEST_USERNAME }}
@@ -367,7 +367,7 @@ jobs:
                   "type": "section",
                   "text": {
                     "type": "plain_text",
-                    "text": "Select the '${{ matrix.platform }}' job and expand 'Integration Tests' to inspect the failures."
+                    "text": "Select the '${{ matrix.sys.os }}' job and expand 'Integration Tests' to inspect the failures."
                   }
                 }
               ]
@@ -386,7 +386,7 @@ jobs:
         name: Upload Session Artifacts
         uses: actions/upload-artifact@v2
         with:
-          name: session-build-${{ matrix.platform }}
+          name: session-build-${{ matrix.sys.os }}
           path: build/
 
   # === Deploy job (runs once with combined artifacts from OS specific job) ===

architecture.md

@@ -64,8 +64,7 @@ from use by external code.
 #### internal/runbits/
 
 Packages that are made available for use by "runner" packages. In essence,
-`internal/runners/internal/runbits`. A synonymous and deprecated directory
-exists at `pkg/cmdlets/`.
+`internal/runners/internal/runbits`.
 
 #### internal/runners/
 

cmd/state-installer/cmd.go

@@ -29,10 +29,10 @@ import (
 	"github.com/ActiveState/cli/internal/output"
 	"github.com/ActiveState/cli/internal/primer"
 	"github.com/ActiveState/cli/internal/rollbar"
+	"github.com/ActiveState/cli/internal/runbits/errors"
 	"github.com/ActiveState/cli/internal/runbits/panics"
 	"github.com/ActiveState/cli/internal/subshell"
 	"github.com/ActiveState/cli/internal/subshell/bash"
-	"github.com/ActiveState/cli/pkg/cmdlets/errors"
 	"github.com/ActiveState/cli/pkg/project"
 	"github.com/ActiveState/cli/pkg/sysinfo"
 	"golang.org/x/crypto/ssh/terminal"
@@ -381,7 +381,7 @@ func postInstallEvents(out output.Outputer, cfg *config.Instance, an analytics.D
 	case params.command != "":
 		an.Event(anaConst.CatInstallerFunnel, "forward-command")
 
-		out.Print(fmt.Sprintf("\nRunning `[ACTIONABLE]%s[/RESET]`\n", params.command))
+		out.Print(fmt.Sprintf("\nRunning '[ACTIONABLE]%s[/RESET]'\n", params.command))
 		cmd, args := exeutils.DecodeCmd(params.command)
 		if _, _, err := exeutils.ExecuteAndPipeStd(cmd, args, envSlice(binPath)); err != nil {
 			an.EventWithLabel(anaConst.CatInstallerFunnel, "forward-command-err", err.Error())
@@ -391,7 +391,7 @@ func postInstallEvents(out output.Outputer, cfg *config.Instance, an analytics.D
 	case params.activate.IsValid():
 		an.Event(anaConst.CatInstallerFunnel, "forward-activate")
 
-		out.Print(fmt.Sprintf("\nRunning `[ACTIONABLE]state activate %s[/RESET]`\n", params.activate.String()))
+		out.Print(fmt.Sprintf("\nRunning '[ACTIONABLE]state activate %s[/RESET]'\n", params.activate.String()))
 		if _, _, err := exeutils.ExecuteAndPipeStd(stateExe, []string{"activate", params.activate.String()}, envSlice(binPath)); err != nil {
 			an.EventWithLabel(anaConst.CatInstallerFunnel, "forward-activate-err", err.Error())
 			return errs.Silence(errs.Wrap(err, "Could not activate %s, error returned: %s", params.activate.String(), errs.JoinMessage(err)))
@@ -400,7 +400,7 @@ func postInstallEvents(out output.Outputer, cfg *config.Instance, an analytics.D
 	case params.activateDefault.IsValid():
 		an.Event(anaConst.CatInstallerFunnel, "forward-activate-default")
 
-		out.Print(fmt.Sprintf("\nRunning `[ACTIONABLE]state activate --default %s[/RESET]`\n", params.activateDefault.String()))
+		out.Print(fmt.Sprintf("\nRunning '[ACTIONABLE]state activate --default %s[/RESET]'\n", params.activateDefault.String()))
 		if _, _, err := exeutils.ExecuteAndPipeStd(stateExe, []string{"activate", params.activateDefault.String(), "--default"}, envSlice(binPath)); err != nil {
 			an.EventWithLabel(anaConst.CatInstallerFunnel, "forward-activate-default-err", err.Error())
 			return errs.Silence(errs.Wrap(err, "Could not activate %s, error returned: %s", params.activateDefault.String(), errs.JoinMessage(err)))

cmd/state-installer/test/integration/installer_int_test.go

@@ -11,7 +11,6 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/ActiveState/cli/internal/condition"
 	"github.com/ActiveState/cli/internal/config"
 	"github.com/ActiveState/cli/internal/constants"
 	"github.com/ActiveState/cli/internal/environment"
@@ -52,9 +51,6 @@ func (suite *InstallerIntegrationTestSuite) TestInstallFromLocalSource() {
 	cp.Expect("Installing State Tool")
 	cp.Expect("Done")
 	cp.Expect("successfully installed")
-	if runtime.GOOS == "darwin" && condition.OnCI() {
-		cp.Expect("You are running bash on macOS")
-	}
 	suite.NotContains(cp.Output(), "Downloading State Tool")
 	cp.ExpectInput()
 	cp.SendLine("exit")
@@ -145,6 +141,7 @@ func (suite *InstallerIntegrationTestSuite) TestInstallIncompatible() {
 	// Assert output
 	cp.Expect("not compatible")
 	cp.ExpectExitCode(1)
+	ts.IgnoreLogErrors()
 }
 
 func (suite *InstallerIntegrationTestSuite) TestInstallNoErrorTips() {
@@ -164,6 +161,7 @@ func (suite *InstallerIntegrationTestSuite) TestInstallNoErrorTips() {
 
 	cp.ExpectExitCode(1)
 	suite.Assert().NotContains(cp.Output(), "Need More Help?", "error tips should not be displayed when invoking installer")
+	ts.IgnoreLogErrors()
 }
 
 func (suite *InstallerIntegrationTestSuite) TestInstallErrorTips() {
@@ -210,7 +208,7 @@ func (suite *InstallerIntegrationTestSuite) TestInstallerOverwriteServiceApp() {
 	)
 	cp.Expect("Done")
 	cp.SendLine("exit")
-	cp.ExpectExitCode(0)
+	cp.ExpectExit() // the return code can vary depending on shell (e.g. zsh vs. bash); just assert the installer shell exited
 
 	// State Service.app should be overwritten cleanly without error.
 	cp = ts.SpawnCmdWithOpts(
@@ -220,7 +218,7 @@ func (suite *InstallerIntegrationTestSuite) TestInstallerOverwriteServiceApp() {
 	)
 	cp.Expect("Done")
 	cp.SendLine("exit")
-	cp.ExpectExitCode(0)
+	cp.ExpectExit() // the return code can vary depending on shell (e.g. zsh vs. bash); just assert the installer shell exited
 }
 
 func (suite *InstallerIntegrationTestSuite) AssertConfig(ts *e2e.Session) {