Merge branch 'version/0-47-1-RC1' into mitchell/dx-3228-4

Author: mitchell-as

.github/workflows/build.yml

@@ -81,7 +81,7 @@ jobs:
       - # === Install State Tool ===
         name: Install State Tool
         uses: ActiveState/setup-state-tool@v1
-        if: "!contains(matrix.sys.os, 'arm')"
+        if: "!contains(matrix.sys.os, 'arm') && runner.os != 'Windows'"
 
       - # === Install State Tool (ARM64) ===
         name: Install State Tool (ARM64)
@@ -92,6 +92,15 @@ jobs:
           echo "$HOME/.local/ActiveState/StateTool/beta/bin" >> $GITHUB_PATH
           "$HOME/.local/ActiveState/StateTool/beta/bin/state" config set optin.unstable true
 
+      - # === Install State Tool (Windows) ===
+        name: Install State Tool (Windows)
+        if: runner.os == 'Windows'
+        shell: pwsh
+        run: |
+          Invoke-Expression -Command ".\installers\install.ps1 -n"
+          echo "$env:LOCALAPPDATA\ActiveState\StateTool\release\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          Invoke-Expression "$env:LOCALAPPDATA\ActiveState\StateTool\release\bin\state config set optin.unstable true"
+
       - # === Setup ===
         name: Setup
         shell: bash

activestate.yaml

@@ -81,7 +81,6 @@ scripts:
   - name: install-deps-ci
     language: bash
     standalone: true
-    if: ne .Shell "cmd"
     value: |
       if { [[ "$GOOS" == "windows" ]] || [[ "$OS" == "Windows_NT" ]]; } && ! type "goversioninfo" &> /dev/null; then
         echo "goversioninfo was not found on your PATH. Installing .."

installers/install.ps1

@@ -154,7 +154,7 @@ function setShellOverride
     $currentPid = $PID
     while ($currentPid -ne 0)
     {
-        $process = Get-WmiObject Win32_Process | Where-Object { $_.ProcessId -eq $currentPid }
+        $process = Get-CimInstance Win32_Process | Where-Object { $_.ProcessId -eq $currentPid }
         if (!$process) { break }
 
         if ($process.Name -eq "cmd" -or $process.Name -eq "cmd.exe")

test/integration/checkout_int_test.go

@@ -395,6 +395,39 @@ func (suite *CheckoutIntegrationTestSuite) TestCheckoutFromArchive() {
 	cp.ExpectExitCode(0)
 }
 
+func (suite *CheckoutIntegrationTestSuite) TestCheckoutPortable() {
+	suite.OnlyRunForTags(tagsuite.Checkout)
+	ts := e2e.New(suite.T(), false)
+	defer ts.Close()
+
+	// Checkout a working runtime.
+	cp := ts.Spawn("checkout", "ActiveState-CLI/small-python#fb513fe6-b9f4-4c54-adf3-8a7833b290f3", ".", "--portable")
+	cp.Expect("Checked out project")
+	cp.ExpectExitCode(0)
+
+	// Remove the artifact depot.
+	suite.Require().NoError(os.RemoveAll(filepath.Join(ts.Dirs.Cache, "depot")))
+
+	// Verify the runtime still works because its contents are copies, not links.
+	proj, err := project.FromPath(ts.Dirs.Work)
+	suite.Require().NoError(err)
+	targetDir := filepath.Join(ts.Dirs.Cache, runtime_helpers.DirNameFromProjectDir(proj.Dir()))
+	pythonExe := filepath.Join(rt.ExecutorsPath(targetDir), "python3"+osutils.ExeExtension)
+	cp = ts.SpawnCmd(pythonExe, "--version")
+	cp.Expect("Python 3")
+	cp.ExpectExitCode(0)
+
+	// Verify there are no symlinks in the runtime.
+	files, err := fileutils.ListDir(targetDir, true)
+	suite.Require().NoError(err)
+	for _, file := range files {
+		path := filepath.Join(targetDir, file.Name())
+		resolvedPath, err := fileutils.ResolvePath(path)
+		suite.Require().NoError(err)
+		suite.Assert().NotContains(resolvedPath, "depot", "runtime file '%s' should not be linked to the depot", file.Name())
+	}
+}
+
 func TestCheckoutIntegrationTestSuite(t *testing.T) {
 	suite.Run(t, new(CheckoutIntegrationTestSuite))
 }

version.txt

@@ -1 +1 @@
-0.48.0-RC1
+0.48.0-RC1