Merge pull request ActiveState#3488 from ActiveState/mitchell/dx-3041

Wrong libc should be an input error.

Author: mitchell-as

.github/workflows/build.yml

@@ -68,7 +68,7 @@ jobs:
 
       - # === Install Go ===
         name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go-version }}
 
@@ -392,7 +392,7 @@ jobs:
 
       - # === Upload Session Artifacts ===
         name: Upload Session Artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: session-build-${{ matrix.sys.os }}
           path: build/
@@ -404,9 +404,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download All Build Session Artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           path: build/
+          merge-multiple: true
 
       - name: Scan for CVEs
         if: runner.os == 'Linux'
@@ -444,7 +445,7 @@ jobs:
 
       - # === Install Go ===
         name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
           go-version: 1.22.x
 
@@ -454,9 +455,10 @@ jobs:
 
       - # === Download All Build Session Artifacts ===
         name: Download All Build Session Artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           path: build/
+          merge-multiple: true
 
       - # === Sanitize All Session Artifacts ===
         name: Sanitize All Session Artifacts
@@ -501,7 +503,7 @@ jobs:
 
       - # === Cleanup Session Artifacts ===
         name: Cleanup Session Artifacts
-        uses: geekyeggo/delete-artifact@v1
+        uses: geekyeggo/delete-artifact@v5
         with:
           name: |
             session-build-ubuntu-20.04
@@ -510,7 +512,7 @@ jobs:
 
       - # === Upload Artifacts ===
         name: Upload Artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: build
           path: build/

.github/workflows/propagate.yml

@@ -25,14 +25,14 @@ jobs:
 
       - # === Checkout code ===
         name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           token: ${{ secrets.GH_AUTOMATION_TOKEN }}
 
       - # === Install Go ===
         name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
           go-version: '1.22.x'
 

.github/workflows/release.yml

@@ -25,7 +25,7 @@ jobs:
     steps:
       - # Checkout Code
         name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v5
 
       - # === Install Go ===
         name: Install Go

.github/workflows/verify.yml

@@ -34,7 +34,7 @@ jobs:
 
       - # === Install Go ===
         name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
           go-version: '1.22.x'
 

internal/runbits/runtime/rationalize.go

@@ -109,7 +109,8 @@ func RationalizeSolveError(proj *project.Project, auth *auth.Auth, rerr *error)
 				*rerr = errs.NewUserFacing(locale.Tr(
 					"err_alternate_branches",
 					noMatchingPlatformErr.HostPlatform, noMatchingPlatformErr.HostArch,
-					proj.BranchName(), strings.Join(branches, "\n - ")))
+					proj.BranchName(), strings.Join(branches, "\n - ")),
+					errs.SetInput())
 				return
 			}
 		}

internal/subshell/subshell_win_test.go

@@ -27,23 +27,24 @@ func setup(t *testing.T) {
 func TestBash(t *testing.T) {
 	setup(t)
 
-	os.Setenv("SHELL", `C:\Program Files\bash.exe`)
+	shellPath := `C:\Program Files\Git\usr\bin\bash.exe`
+	os.Setenv("SHELL", shellPath)
 	cfg, err := config.New()
 	require.NoError(t, err)
 	subs := New(cfg)
-	assert.Equal(t, `C:\Program Files\bash.exe`, subs.Binary())
+	assert.Equal(t, shellPath, subs.Binary())
 
 }
 
 func TestBashDontEscapeSpace(t *testing.T) {
 	setup(t)
 
 	// Reproduce bug in which paths are being incorrectly escaped on windows
-	os.Setenv("SHELL", `C:\Program\ Files\bash.exe`)
+	os.Setenv("SHELL", `C:\Program\ Files\Git\usr\bin\bash.exe`)
 	cfg, err := config.New()
 	require.NoError(t, err)
 	subs := New(cfg)
-	assert.Equal(t, `C:\Program Files\bash.exe`, subs.Binary())
+	assert.Equal(t, `C:\Program Files\Git\usr\bin\bash.exe`, subs.Binary())
 }
 
 func TestRunCommandError(t *testing.T) {