@gearbox-protocol/deploy-tools 4.24.0 → 4.24.2

package/dist/index.mjs

@@ -342345,14 +342345,28 @@ async function cloneRepo(opts) {
     }
     log.trace(`reset ${repoPath} to ${commit}`);
   } else {
-    log.trace(`pulling ${repoPath}...`);
-    let { stderr, status, error } = spawnSync("git", ["pull"], {
+    log.trace(`fetching latest from ${repoPath}...`);
+    const fetchResult = spawnSync("git", ["fetch", "--all"], {
       cwd: path.resolve(sandboxDir, destDir)
     });
-    if (error || status !== 0) {
-      throw error ?? new Error(stderr?.toString());
+    if (fetchResult.error || fetchResult.status !== 0) {
+      throw fetchResult.error ?? new Error(fetchResult.stderr?.toString());
+    }
+    let currentBranchResult = spawnSync("git", ["rev-parse", "--abbrev-ref", "HEAD"], {
+      cwd: path.resolve(sandboxDir, destDir)
+    });
+    if (currentBranchResult.error || currentBranchResult.status !== 0) {
+      throw currentBranchResult.error ?? new Error(currentBranchResult.stderr?.toString());
+    }
+    const currentBranch = currentBranchResult.stdout.toString().trim();
+    log.trace(`resetting ${repoPath} to latest commit in origin/${currentBranch}...`);
+    let resetResult = spawnSync("git", ["reset", "--hard", `origin/${currentBranch}`], {
+      cwd: path.resolve(sandboxDir, destDir)
+    });
+    if (resetResult.error || resetResult.status !== 0) {
+      throw resetResult.error ?? new Error(resetResult.stderr?.toString());
     }
-    log.trace(`pulled ${repoPath}...`);
+    log.trace(`updated ${repoPath} to the latest commit`);
   }
 }
 async function clearDir(dir) {
@@ -366454,7 +366468,7 @@ function getRenderer(opts) {
 }
 
 // package.json
-var version3 = "4.24.0";
+var version3 = "4.24.2";
 
 // src/version.ts
 var version_default = version3;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gearbox-protocol/deploy-tools",
   "description": "Gearbox deploy tools",
-  "version": "4.24.0",
+  "version": "4.24.2",
   "homepage": "https://gearbox.fi",
   "keywords": [
     "gearbox"