chore: update workflow

sudoblockio · Oct 17, 2024 · 42cfa69 · 42cfa69
1 parent e58aec0
commit 42cfa69
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/copy.bara.sky.ts b/src/copy.bara.sky.ts
@@ -59,9 +59,9 @@ core.workflow(
 # Pull Request workflow
 core.workflow(
     name = "pr",
-    origin = git.github_pr_origin(
+    origin = git.origin(
         url = SOT_REPO,
-        branch = SOT_BRANCH,
+        ref = SOT_BRANCH,
     ),
     destination = git.github_pr_destination(
         url = DESTINATION_REPO,
@@ -75,6 +75,7 @@ core.workflow(
     destination_files = glob(PUSH_INCLUDE, exclude = PUSH_EXCLUDE),
     authoring = authoring.pass_thru(default = COMMITTER),
     mode = "ITERATIVE",
+    set_rev_id = False,
     transformations = [
         metadata.save_author("ORIGINAL_AUTHOR"),
         metadata.expose_label("GITHUB_PR_NUMBER", new_name = "Closes", separator = SOT_REPO.replace("[email protected]:", " ").replace(".git", "#")),

diff --git a/src/copybara.ts b/src/copybara.ts
@@ -23,7 +23,7 @@ export class CopyBara {
       case "pr":
         return this.exec(
           ["-e", "COPYBARA_WORKFLOW=pr", "-e", `COPYBARA_SOURCEREF=${ref}`],
-          ["--force", ...copybaraOptions]
+          ["--force","--last-rev","-15", ...copybaraOptions]
         );
 
       default: