Temporarily disable localcommit files and buildscripts. #2853
Conversation
mitchell-as
commented
Oct 30, 2023
•
mitchell-as
commented
 DX-2303 Guard against project migration and local order file creation
|
mitchell-as
force-pushed
the
mitchell/dx-2303
branch
from
dbf5b2e to
0967788
Compare
mitchell-as
force-pushed
the
mitchell/dx-2303
branch
from
0967788 to
f09a2a3
Compare
mitchell-as
force-pushed
the
mitchell/dx-2303
branch
from
f09a2a3 to
c2215ab
Compare
|
This PR looks bigger than it is because it depends on some branches that have not yet been merged. The relevant changes are in the last two commits, which can be viewed separately here: https://github.com/ActiveState/cli/pull/2853/files/fb9374a399b28367b66094d10ecc501c97d19574..c2215ab66ec5f96f426c5f4e87e6c574c5f51396 |
| "github.com/ActiveState/cli/internal/runbits/legacy/projectmigration" | ||
| "github.com/ActiveState/cli/pkg/localcommit" | ||
| // Re-enable in DX-2307. | ||
| //"github.com/ActiveState/cli/internal/errs" |
There was a problem hiding this comment.
It should be okay to let goimports handle this kind of stuff. I'm not sure how it will handle import statements with comments in them as we iterate on these files before we re-enable everything.
internal/runners/initialize/init.go
Outdated
| } | ||
| } | ||
| // Re-enable in DX-2307. | ||
| //if emptyDir || fileutils.DirExists(filepath.Join(path, ".git")) {B |
There was a problem hiding this comment.
| //if emptyDir || fileutils.DirExists(filepath.Join(path, ".git")) {B | |
| //if emptyDir || fileutils.DirExists(filepath.Join(path, ".git")) { |
| @@ -939,6 +963,11 @@ func createCustom(params *CreateParams, lang language.Language) (*Project, error | |||
| q.Set("branch", params.BranchName) | |||
| } | |||
|
|
|||
| // Remove this block in DX-2307. | |||
| if params.LegacyCommitID != "" { | |||
There was a problem hiding this comment.
Should this be an error condition?
There was a problem hiding this comment.
No. In particular when running state init, this will be empty. After the project is created on the Platform, the commitID is polled and filled in retroactively.
| suite.Require().True(fileutils.FileExists(commitIdFile), "ActiveState-CLI/Python3 was not checked out properly") | ||
| suite.Assert().Equal(string(fileutils.ReadFileUnsafe(commitIdFile)), "6d9280e7-75eb-401a-9e71-0d99759fbad3", "did not check out specific commit ID") | ||
| // Re-enable the following lines in DX-2307. | ||
| //suite.Require().True(fileutils.DirExists(python3Dir), "state checkout should have created "+python3Dir) |
There was a problem hiding this comment.
This line should still be valid
There was a problem hiding this comment.
Thanks for catching this!
|
I don't know if the merge from v42 into this PR affects this review from your side, but just in case, here are the changes from your last review: https://github.com/ActiveState/cli/pull/2853/files/c2215ab66ec5f96f426c5f4e87e6c574c5f51396..eae791b1feb6c6b02fa1dd021a08d9aab73bf82e |
Much appreciated! |
|
@MDrakos Please re-approve. I had to perform a merge that conflicted on imports that was fixed here: 9403510#diff-c901c5791c0890edb63dc96809aa643617ebb5cd307e8877bf8c791ccf88147cR17. |
