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.

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

[move] Change copybara to sync with move-on-aptos #15458

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions third_party/copy.bara.sky
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
moveUrl = "https://github.com/move-language/move.git"
moveUrl = "https://github.com/move-language/move-on-aptos.git"
aptosUrl = "https://github.com/aptos-labs/aptos-core.git"

# Workflow to pull from Move to Aptos. This creates a draft PR at the fixed branch `from_move`
Expand All @@ -7,7 +7,7 @@ core.workflow(
name = "pull_move",
origin = git.github_origin(
url = moveUrl,
ref = "aptos-main",
ref = "main",
),
destination = git.destination(
url = "NOT_SET", # use --git-destination-url to set this
Expand All @@ -33,7 +33,7 @@ core.workflow(
),
destination = git.destination(
url = "NOT_SET", # use --git-destination-url to set this
fetch = "aptos-main",
fetch = "main",
push = "to_move",
integrates = [],
),
Expand All @@ -55,7 +55,7 @@ core.workflow(
),
destination = git.github_destination(
url = moveUrl,
push = "aptos-main",
push = "main",
),
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Note: this flow does not work anymore, because main is protected. Should we just remove it? cc @wrwg

Copy link
Contributor

Choose a reason for hiding this comment

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

Screenshot 2024-12-03 at 10 19 56 AM

Might need to tweak the repo config here. In the future we'll likely need set up a bot for this.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, we probably need an automation to sync e.g. nightly etc. PRs are nicer though because if there are crate dependencies, these do not automatically sync with copybara

mode = "ITERATIVE",
origin_files = glob(["third_party/move/**"]),
Expand Down
Loading