fix: Pull before push in publish-crates-homebrew (eclipse-zenoh#132)

ZettaScaleLabs · May 7, 2024 · 07353a2 · 07353a2
1 parent 40b8bad
commit 07353a2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/dist/publish-crates-homebrew-main.js b/dist/publish-crates-homebrew-main.js
@@ -127767,6 +127767,7 @@ async function main(input) {
             (0,_command__WEBPACK_IMPORTED_MODULE_4__.sh)("brew autoremove");
         }
         if (input.liveRun) {
+            (0,_command__WEBPACK_IMPORTED_MODULE_4__.sh)(`git pull ${tapUrl} --rebase`, { cwd: tapPath });
             (0,_command__WEBPACK_IMPORTED_MODULE_4__.sh)(`git push ${tapUrl}`, { cwd: tapPath });
         }
         cleanup(input);

diff --git a/src/publish-crates-homebrew.ts b/src/publish-crates-homebrew.ts
@@ -128,6 +128,7 @@ export async function main(input: Input) {
     }
 
     if (input.liveRun) {
+      sh(`git pull ${tapUrl} --rebase`, { cwd: tapPath });
       sh(`git push ${tapUrl}`, { cwd: tapPath });
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -128,6 +128,7 @@ export async function main(input: Input) { @@
         }
         if (input.liveRun) {
+          sh(`git pull ${tapUrl} --rebase`, { cwd: tapPath });
           sh(`git push ${tapUrl}`, { cwd: tapPath });
         }
@@ Expand Down @@