Merge branch 'master' into sarah/ui

.gitmodules

@@ -43,8 +43,8 @@
 	# branch = docs
 [submodule "docs/latest/builds/sway"]
 	path = docs/latest/builds/sway
-	# branch = gh-pages
 	url = https://github.com/FuelLabs/sway.git
+	# branch = gh-pages
 [submodule "docs/latest/fuels-wallet"]
 	path = docs/latest/fuels-wallet
 	url = https://github.com/FuelLabs/fuels-wallet.git

scripts/update-latest/gitUtils.mjs

@@ -50,6 +50,12 @@ export const checkoutVersion = async (version, dir) => {
   });
 };
 
+export const checkoutBranch = async (branch, dir) => {
+  await exec('git', ['checkout', branch], {
+    cwd: dir,
+  });
+};
+
 export const commitAll = async (message) => {
   await exec('git', ['add', '.']);
   await exec('git', ['commit', '-m', message]);
@@ -108,3 +114,57 @@ export const gitResetCommit = async (releaseCommit, dir) => {
     cwd: dir,
   });
 };
+
+export const getReleaseTimestamp = async (version, dir) => {
+  try {
+    let releaseTimestamp = null;
+    await exec('git', ['log', '--format="%ct"', '-n', '1', `tags/${version}`], {
+      cwd: dir,
+      listeners: {
+        stdout: (data) => {
+          console.log('data.toString()', data.toString());
+          releaseTimestamp = parseInt(data.toString().trim().slice(1, -1), 10);
+        },
+      },
+    });
+    return releaseTimestamp;
+  } catch (error) {
+    console.error(
+      `Error getting commit timestamp for version ${version}: ${error.message}`
+    );
+    return null;
+  }
+};
+
+export const getCommitByTimestamp = async (timestamp, branch, dir) => {
+  try {
+    let closestCommitHash = '';
+    let commits = [];
+
+    // Fetch all commits in branch
+    await exec('git', ['log', '--format="%H %ct"', '--max-count=300', branch], {
+      cwd: dir,
+      listeners: {
+        stdout: (data) => {
+          const commitLines = data.toString().trim().split('\n');
+          commits = commits.concat(commitLines);
+        },
+      },
+    });
+
+    // Find a commit with a timestamp after the timestamp
+    for (let i = 0; i < commits.length; i++) {
+      const commit = commits[i];
+      const [commitHash, commitTimestamp] = commit.split(' ');
+      const cleanTS = parseInt(commitTimestamp.slice(0, -1));
+      if (cleanTS < timestamp) {
+        break;
+      }
+      closestCommitHash = commitHash.substr(1);
+    }
+
+    return closestCommitHash;
+  } catch (error) {
+    console.error(`Error finding commit by timestamp: ${error.message}`);
+  }
+};

scripts/update-latest/updateLatest.mjs

@@ -9,8 +9,10 @@ import {
   createPR,
   fetchTag,
   fetchBranch,
-  getVersionCommit,
+  getReleaseTimestamp,
   gitResetCommit,
+  getCommitByTimestamp,
+  checkoutBranch,
 } from './gitUtils.mjs';
 
 export async function updateLatest(newVersions) {
@@ -106,15 +108,21 @@ export async function update(version, dir, branch) {
     await checkoutVersion(version, dir);
   }
   if (branch) {
-    let releaseCommit;
+    let releaseTimestamp;
     if (dir !== 'docs/latest/fuels-ts') {
-      releaseCommit = await getVersionCommit(version, dir);
+      releaseTimestamp = await getReleaseTimestamp(version, dir);
+      console.log('RELEASE TIMESTAMP:', releaseTimestamp);
     }
     await fetchBranch(branch, dir);
-    await switchToExistingBranch(branch, dir);
+    await checkoutBranch(branch, dir);
     if (dir !== 'docs/latest/fuels-ts') {
-      // go to the version commit in the right branch;
-      await gitResetCommit(releaseCommit, dir);
+      const commitHash = await getCommitByTimestamp(
+        releaseTimestamp,
+        branch,
+        dir
+      );
+      console.log('COMMIT HASH:', commitHash);
+      await gitResetCommit(commitHash, dir);
     }
   }
 }