Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use move compiler v2 by default #14967

Merged
merged 2 commits into from
Oct 21, 2024
Merged

use move compiler v2 by default #14967

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3e74e8
use move compiler v2 for forge
aluon Oct 15, 2024
35136e0
Merge branch 'main' into aluon/forge-move-compiler-v2
aluon Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docker/builder/build-tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,6 @@ for BIN in "${BINS[@]}"; do
done

# Build the Aptos Move framework and place it in dist. It can be found afterwards in the current directory.
echo "MOVE_COMPILER_V2: ${MOVE_COMPILER_V2:-not set}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason we dont just set this here to ensure that its set whenever we're running tools?c

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can make the change here instead

I originally planned to have two tools image with compiler v2 enabled/disabled so I put this in the Dockerfile

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm just going to keep the env var in the Dockerfile since this is already tested. This looks like the only place we use the build-tools script

echo "Building the Aptos Move framework..."
(cd dist && cargo run --locked --profile=$PROFILE --package aptos-framework -- release)
1 change: 1 addition & 0 deletions docker/builder/builder.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ RUN --mount=type=secret,id=GIT_CREDENTIALS,target=/root/.git-credentials \

FROM builder-base as tools-builder

ENV MOVE_COMPILER_V2=true
RUN --mount=type=secret,id=GIT_CREDENTIALS,target=/root/.git-credentials \
--mount=type=cache,target=/usr/local/cargo/git,id=tools-builder-cargo-git-cache \
--mount=type=cache,target=/usr/local/cargo/registry,id=tools-builder-cargo-registry-cache \
Expand Down
2 changes: 1 addition & 1 deletion docker/builder/forge.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ ENV GIT_BRANCH ${GIT_BRANCH}
ARG GIT_SHA
ENV GIT_SHA ${GIT_SHA}

ENTRYPOINT ["/tini", "--", "forge"]
ENTRYPOINT ["/tini", "--", "forge"]
Loading