Merge pull request #3645 from ActiveState/version/0-47-1-RC1

Naatan · web-flow · commit cde656ccf74d · 2025-02-21T11:09:03.000-08:00
Version 0.47.1-RC1
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -81,6 +81,16 @@ jobs:
       - # === Install State Tool ===
         name: Install State Tool
         uses: ActiveState/setup-state-tool@v1
+        if: runner.os != 'Windows'
+
+      - # === 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
@@ -262,7 +272,7 @@ jobs:
 
       - # === Configure AWS credentials ==
         name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
           role-session-name: ${{ env.AWS_ROLE_SESSION_NAME }}
@@ -482,7 +492,7 @@ jobs:
 
       - # === Configure AWS credentials ==
         name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
           role-session-name: ${{ env.AWS_ROLE_SESSION_NAME }}
diff --git a/activestate.yaml b/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 .."
diff --git a/cmd/state/internal/cmdtree/checkout.go b/cmd/state/internal/cmdtree/checkout.go
@@ -26,6 +26,11 @@ func newCheckoutCommand(prime *primer.Values) *captain.Command {
 				Description: locale.Tl("flag_state_checkout_runtime-path_description", "Path to store the runtime files"),
 				Value:       &params.RuntimePath,
 			},
+			{
+				Name:        "portable",
+				Description: locale.Tl("flag_state_checkout_portable_description", "Copy files to their runtime path instead of linking to them"),
+				Value:       &params.Portable,
+			},
 			{
 				Name:        "no-clone",
 				Description: locale.Tl("flag_state_checkout_no_clone_description", "Do not clone the github repository associated with this project (if any)"),
diff --git a/installers/install.ps1 b/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")
diff --git a/internal/assets/contents/activestate.yaml.cache.tpl b/internal/assets/contents/activestate.yaml.cache.tpl
@@ -1,2 +1,3 @@
 # It is recommended that you do not commit this file as it contains configuration that is specific to your machine
 cache: {{ .Cache }}
+portable: {{ .Portable }}
diff --git a/internal/runbits/checkout/checkout.go b/internal/runbits/checkout/checkout.go
@@ -52,7 +52,7 @@ func New(repo git.Repository, prime primeable) *Checkout {
 	return &Checkout{repo, prime}
 }
 
-func (r *Checkout) Run(ns *project.Namespaced, branchName, cachePath, targetPath string, noClone, bareCheckout bool) (_ string, rerr error) {
+func (r *Checkout) Run(ns *project.Namespaced, branchName, cachePath, targetPath string, noClone, bareCheckout, portable bool) (_ string, rerr error) {
 	defer r.rationalizeError(&rerr)
 
 	path, err := r.pathToUse(ns, targetPath)
@@ -94,7 +94,7 @@ func (r *Checkout) Run(ns *project.Namespaced, branchName, cachePath, targetPath
 		return "", errNoCommitID
 	}
 
-	if err := CreateProjectFiles(path, cachePath, owner, proj, branchName, commitID.String(), language); err != nil {
+	if err := CreateProjectFiles(path, cachePath, owner, proj, branchName, commitID.String(), language, portable); err != nil {
 		return "", errs.Wrap(err, "Could not create project files")
 	}
 
@@ -182,7 +182,7 @@ func (r *Checkout) fetchProject(
 	return owner, proj, commitID, branchName, language, pj.RepoURL, nil
 }
 
-func CreateProjectFiles(checkoutPath, cachePath, owner, name, branch, commitID, language string) error {
+func CreateProjectFiles(checkoutPath, cachePath, owner, name, branch, commitID, language string, portable bool) error {
 	configFile := filepath.Join(checkoutPath, constants.ConfigFileName)
 	if !fileutils.FileExists(configFile) {
 		_, err := projectfile.Create(&projectfile.CreateParams{
@@ -192,6 +192,7 @@ func CreateProjectFiles(checkoutPath, cachePath, owner, name, branch, commitID,
 			Directory:  checkoutPath,
 			Language:   language,
 			Cache:      cachePath,
+			Portable:   portable,
 		})
 		if err != nil {
 			if osutils.IsAccessDeniedError(err) {
diff --git a/internal/runbits/runtime/runtime.go b/internal/runbits/runtime/runtime.go
@@ -252,6 +252,9 @@ func Update(
 	if opts.Archive != nil {
 		rtOpts = append(rtOpts, runtime.WithArchive(opts.Archive.Dir, opts.Archive.PlatformID, checkout.ArtifactExt))
 	}
+	if proj.IsPortable() {
+		rtOpts = append(rtOpts, runtime.WithPortable())
+	}
 
 	if err := rt.Update(buildPlan, rtHash, rtOpts...); err != nil {
 		return nil, locale.WrapError(err, "err_packages_update_runtime_install")
diff --git a/internal/runners/activate/activate.go b/internal/runners/activate/activate.go
@@ -95,7 +95,7 @@ func (r *Activate) Run(params *ActivateParams) (rerr error) {
 		}
 
 		// Perform fresh checkout
-		pathToUse, err := r.activateCheckout.Run(params.Namespace, params.Branch, "", params.PreferredPath, false, false)
+		pathToUse, err := r.activateCheckout.Run(params.Namespace, params.Branch, "", params.PreferredPath, false, false, false)
 		if err != nil {
 			return locale.WrapError(err, "err_activate_pathtouse", "Could not figure out what path to use.")
 		}
diff --git a/internal/runners/checkout/checkout.go b/internal/runners/checkout/checkout.go
@@ -38,6 +38,7 @@ type Params struct {
 	RuntimePath   string
 	NoClone       bool
 	Force         bool
+	Portable      bool
 }
 
 type primeable interface {
@@ -121,7 +122,7 @@ func (u *Checkout) Run(params *Params) (rerr error) {
 
 	u.out.Notice(locale.Tr("checking_out", ns.String()))
 
-	projectDir, err := u.checkout.Run(ns, params.Branch, params.RuntimePath, params.PreferredPath, params.NoClone, archive != nil)
+	projectDir, err := u.checkout.Run(ns, params.Branch, params.RuntimePath, params.PreferredPath, params.NoClone, archive != nil, params.Portable)
 	if err != nil {
 		return errs.Wrap(err, "Checkout failed")
 	}
diff --git a/internal/runners/deploy/deploy.go b/internal/runners/deploy/deploy.go
@@ -168,7 +168,7 @@ func (d *Deploy) install(params *Params, commitID strfmt.UUID) (rerr error) {
 
 	if err := checkout.CreateProjectFiles(
 		params.Path, params.Path, params.Namespace.Owner, params.Namespace.Project,
-		constants.DefaultBranchName, commitID.String(), "",
+		constants.DefaultBranchName, commitID.String(), "", true,
 	); err != nil {
 		return errs.Wrap(err, "Could not create project files")
 	}
diff --git a/pkg/buildscript/marshal.go b/pkg/buildscript/marshal.go
@@ -22,6 +22,7 @@ const (
 	ltFuncName  = "Lt"
 	lteFuncName = "Lte"
 	andFuncName = "And"
+	anyFuncName = "Any"
 )
 
 // Marshal returns this structure in AScript, suitable for writing to disk.
diff --git a/pkg/buildscript/marshal_buildexpression.go b/pkg/buildscript/marshal_buildexpression.go
@@ -153,6 +153,10 @@ func marshalReq(fn *funcCall) ([]byte, error) {
 							return errs.Wrap(err, "Could not marshal additional requirement")
 						}
 					}
+				case anyFuncName:
+					// We can ignore the `version = Any()` argument; omitting it is an equivalent statement.
+					// As mentioned in this function's comment, once buildexpressions support requirements as
+					// functions, we won't need to do any of this anymore.
 				default:
 					return errs.New("Unknown version comparator: %s", name)
 				}
diff --git a/pkg/project/project.go b/pkg/project/project.go
@@ -255,6 +255,8 @@ func (p *Project) Lock() string { return p.projectfile.Lock }
 // Cache returns the cache information for this project
 func (p *Project) Cache() string { return p.projectfile.Cache }
 
+func (p *Project) IsPortable() bool { return p.projectfile.Portable }
+
 // Namespace returns project namespace
 func (p *Project) Namespace() *Namespaced {
 	return &Namespaced{Owner: p.projectfile.Owner(), Project: p.projectfile.Name()}
diff --git a/pkg/projectfile/projectfile.go b/pkg/projectfile/projectfile.go
@@ -108,6 +108,7 @@ type Project struct {
 	Jobs          Jobs          `yaml:"jobs,omitempty"`
 	Private       bool          `yaml:"private,omitempty"`
 	Cache         string        `yaml:"cache,omitempty"`
+	Portable      bool          `yaml:"portable,omitempty"`
 	path          string        // "private"
 	parsedURL     projectURL    // parsed url data
 	parsedChannel string
@@ -920,6 +921,7 @@ type CreateParams struct {
 	path       string
 	ProjectURL string
 	Cache      string
+	Portable   bool
 }
 
 // Create will create a new activestate.yaml with a projectURL for the given details
@@ -1019,7 +1021,7 @@ func createCustom(params *CreateParams, lang language.Language) (*Project, error
 	}
 
 	if params.Cache != "" {
-		createErr := createHostFile(params.Directory, params.Cache)
+		createErr := createHostFile(params.Directory, params.Cache, params.Portable)
 		if createErr != nil {
 			return nil, errs.Wrap(createErr, "Could not create cache file")
 		}
@@ -1028,14 +1030,15 @@ func createCustom(params *CreateParams, lang language.Language) (*Project, error
 	return Parse(params.path)
 }
 
-func createHostFile(filePath, cachePath string) error {
+func createHostFile(filePath, cachePath string, portable bool) error {
 	user, err := user.Current()
 	if err != nil {
 		return errs.Wrap(err, "Could not get current user")
 	}
 
 	data := map[string]interface{}{
-		"Cache": cachePath,
+		"Cache":    cachePath,
+		"Portable": portable,
 	}
 
 	tplName := "activestate.yaml.cache.tpl"
diff --git a/pkg/runtime/options.go b/pkg/runtime/options.go
@@ -17,6 +17,10 @@ func WithPreferredLibcVersion(version string) SetOpt {
 	return func(opts *Opts) { opts.PreferredLibcVersion = version }
 }
 
+func WithPortable() SetOpt {
+	return func(opts *Opts) { opts.Portable = true }
+}
+
 func WithArchive(dir string, platformID strfmt.UUID, ext string) SetOpt {
 	return func(opts *Opts) {
 		opts.FromArchive = &fromArchive{dir, platformID, ext}
diff --git a/pkg/runtime/setup.go b/pkg/runtime/setup.go
@@ -46,6 +46,7 @@ type Opts struct {
 	PreferredLibcVersion string
 	EventHandlers        []events.HandlerFunc
 	BuildlogFilePath     string
+	Portable             bool
 
 	FromArchive *fromArchive
 
@@ -465,7 +466,7 @@ func (s *setup) install(id strfmt.UUID) (rerr error) {
 		return errs.Wrap(err, "Could not get env")
 	}
 
-	if envDef.NeedsTransforms() || !s.supportsHardLinks {
+	if envDef.NeedsTransforms() || !s.supportsHardLinks || s.opts.Portable {
 		if err := s.depot.DeployViaCopy(id, envDef.InstallDir, s.path); err != nil {
 			return errs.Wrap(err, "Could not deploy artifact via copy")
 		}
diff --git a/test/integration/buildscript_int_test.go b/test/integration/buildscript_int_test.go
@@ -159,6 +159,30 @@ main = wheel
 	suite.Contains(files, "sample_activestate-1.0.0.dist-info/WHEEL")
 }
 
+func (suite *BuildScriptIntegrationTestSuite) TestBuildScriptRequirementVersionAny() {
+	suite.OnlyRunForTags(tagsuite.BuildScripts)
+	ts := e2e.New(suite.T(), false)
+	defer ts.Close()
+
+	cp := ts.Spawn("config", "set", constants.AsyncRuntimeConfig, "true")
+	cp.ExpectExitCode(0)
+
+	// Enable as part of DX-3230.
+	//cp = ts.Spawn("config", "set", constants.OptinBuildscriptsConfig, "true")
+	//cp.ExpectExitCode(0)
+
+	// This project's build expression has a requirement whose version is the "Any()" function.
+	// Make sure we can successfully checkout and modify this project.
+	// Previously, no version would be given for such a requirement.
+	cp = ts.Spawn("checkout", "ActiveState/python3-MacOS#b6aac9cf-a758-42d6-9574-78ec513ad8e9", ".")
+	cp.Expect("Checked out project")
+	cp.ExpectExitCode(0)
+
+	cp = ts.Spawn("install", "dotenv")
+	cp.Expect("Added: language/python/dotenv@Auto")
+	cp.ExpectExitCode(0)
+}
+
 func TestBuildScriptIntegrationTestSuite(t *testing.T) {
 	suite.Run(t, new(BuildScriptIntegrationTestSuite))
 }
diff --git a/test/integration/checkout_int_test.go b/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))
 }
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-0.47.0-RC3
+0.47.1-RC1

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ function setShellOverride`
`154`	`154`	`$currentPid = $PID`
`155`	`155`	`while ($currentPid -ne 0)`
`156`	`156`	`{`
`157`		`- $process = Get-WmiObject Win32_Process \| Where-Object { $_.ProcessId -eq $currentPid }`
	`157`	`+ $process = Get-CimInstance Win32_Process \| Where-Object { $_.ProcessId -eq $currentPid }`
`158`	`158`	`if (!$process) { break }`
`159`	`159`
`160`	`160`	`if ($process.Name -eq "cmd" -or $process.Name -eq "cmd.exe")`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`# It is recommended that you do not commit this file as it contains configuration that is specific to your machine`
`2`	`2`	`cache: {{ .Cache }}`
	`3`	`+portable: {{ .Portable }}`
Original file line number	Diff line number	Diff line change
`@@ -252,6 +252,9 @@ func Update(`
`252`	`252`	`if opts.Archive != nil {`
`253`	`253`	`rtOpts = append(rtOpts, runtime.WithArchive(opts.Archive.Dir, opts.Archive.PlatformID, checkout.ArtifactExt))`
`254`	`254`	`}`
	`255`	`+ if proj.IsPortable() {`
	`256`	`+ rtOpts = append(rtOpts, runtime.WithPortable())`
	`257`	`+ }`
`255`	`258`
`256`	`259`	`if err := rt.Update(buildPlan, rtHash, rtOpts...); err != nil {`
`257`	`260`	`return nil, locale.WrapError(err, "err_packages_update_runtime_install")`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ func (r Activate) Run(params ActivateParams) (rerr error) {`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`// Perform fresh checkout`
`98`		`- pathToUse, err := r.activateCheckout.Run(params.Namespace, params.Branch, "", params.PreferredPath, false, false)`
	`98`	`+ pathToUse, err := r.activateCheckout.Run(params.Namespace, params.Branch, "", params.PreferredPath, false, false, false)`
`99`	`99`	`if err != nil {`
`100`	`100`	`return locale.WrapError(err, "err_activate_pathtouse", "Could not figure out what path to use.")`
`101`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ type Params struct {`
`38`	`38`	`RuntimePath string`
`39`	`39`	`NoClone bool`
`40`	`40`	`Force bool`
	`41`	`+ Portable bool`
`41`	`42`	`}`
`42`	`43`
`43`	`44`	`type primeable interface {`
`@@ -121,7 +122,7 @@ func (u Checkout) Run(params Params) (rerr error) {`
`121`	`122`
`122`	`123`	`u.out.Notice(locale.Tr("checking_out", ns.String()))`
`123`	`124`
`124`		`- projectDir, err := u.checkout.Run(ns, params.Branch, params.RuntimePath, params.PreferredPath, params.NoClone, archive != nil)`
	`125`	`+ projectDir, err := u.checkout.Run(ns, params.Branch, params.RuntimePath, params.PreferredPath, params.NoClone, archive != nil, params.Portable)`
`125`	`126`	`if err != nil {`
`126`	`127`	`return errs.Wrap(err, "Checkout failed")`
`127`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ func (d Deploy) install(params Params, commitID strfmt.UUID) (rerr error) {`
`168`	`168`
`169`	`169`	`if err := checkout.CreateProjectFiles(`
`170`	`170`	`params.Path, params.Path, params.Namespace.Owner, params.Namespace.Project,`
`171`		`- constants.DefaultBranchName, commitID.String(), "",`
	`171`	`+ constants.DefaultBranchName, commitID.String(), "", true,`
`172`	`172`	`); err != nil {`
`173`	`173`	`return errs.Wrap(err, "Could not create project files")`
`174`	`174`	`}`