[CLI] Set Move 2 as default in Aptos CLI and add move-1 flag
#15431
+18
−7
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
⏱️ 1h 13m total CI duration on this PR
|
![graphite-app[bot]](https://avatars.githubusercontent.com/in/158384?s=60&v=4){kind=small}
rahxephon89
force-pushed
the
teng/add-move-1-flags
branch
3 times, most recently
from
f2cbfa0
to
66949be
Compare
rahxephon89
force-pushed
the
teng/add-move-1-flags
branch
from
66949be
to
072f8a1
Compare
rahxephon89
changed the title
move-1 flagmove-1 flag
brmataptos
approved these changes
Nov 30, 2024
crates/aptos/src/common/types.rs
Outdated
| @@ -1163,25 +1164,33 @@ pub struct MovePackageDir { | |||
|
|
|||
| /// ...or --compiler COMPILER_VERSION | |||
| /// Specify the version of the compiler. | |||
| /// Defaults to `1`, unless `--move-2` is selected. | |||
| /// Defaults to the latest stable compiler version | |||
There was a problem hiding this comment.
Perhaps note that this is (at least 2), since if you're not a compiler developer you don't know that 2 is stable.
crates/aptos/src/common/types.rs
Outdated
| verbatim_doc_comment)] | ||
| pub compiler_version: Option<CompilerVersion>, | ||
|
|
||
| /// ...or --language LANGUAGE_VERSION | ||
| /// Specify the language version to be supported. | ||
| /// Defaults to `1`, unless `--move-2` is selected. | ||
| /// Defaults to the latest stable language version |
There was a problem hiding this comment.
Again here, note (at least 2).
vineethk
reviewed
Dec 2, 2024
| #[clap(long, value_parser = clap::value_parser!(CompilerVersion), | ||
| alias = "compiler", | ||
| default_value = LATEST_STABLE_COMPILER_VERSION, |
There was a problem hiding this comment.
You may want to address #14441 and close it with this PR.
| default_value_if("move_2", "true", LATEST_STABLE_COMPILER_VERSION), | ||
| default_value_if("move_1", "true", "1"), |
There was a problem hiding this comment.
Could we also (at least manually) test: aptos move test and coverage, with: (a) --move-2, (b) --move-1, (c) neither. (a) and (c) should not panic on `MVC_BLOCK_V1=1, whereas (b) should.
rahxephon89
force-pushed
the
teng/add-move-1-flags
branch
from
072f8a1
to
b05cbeb
Compare
rahxephon89
commented
Dec 2, 2024
| @@ -909,7 +909,6 @@ impl IncludedArtifacts { | |||
| experiments.append(&mut move_options.experiments.clone()); | |||
| experiments.append(&mut more_experiments); | |||
|
|
|||
| // TODO(#14441): Remove `None |` here when we update default CompilerVersion | |||
There was a problem hiding this comment.
This comment is removed because LATEST_STABLE_COMPILER_VERSION is set as the default value cc @brmataptos @vineethk
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR
aptos governance.--move-1flag to use Compiler v1 and Move 1.Note that for the command
aptos governance,--move-2is still required for using Move 2.Close #14441
How Has This Been Tested?
Manually test
aptos move compileandaptos move publishwill compile and publish modules generated by compiler v2.Manually test
aptos move compile --move-1andaptos move publish --move-1will compile and publish modules generated by compiler v1.Manually test
aptos move compile --move-2andaptos move publish --move-2will compile and publish modules generated by compiler v2.Manually test
aptos move testwith: (a) --move-2, (b) --move-1, (c) neither. (a) and (c) does not panic onMVC_BLOCK_V1=1while (b) does.Key Areas to Review
Whether this change covers all the use cases of using the compiler except for governance.
Type of Change
Which Components or Systems Does This Change Impact?
Checklist