chore: allow multiple tags

meshcloud · Mar 12, 2024 · fdedd85 · fdedd85
1 parent abb2340
commit fdedd85
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 18 deletions.
diff --git a/src/api/git/GitCliFacade.ts b/src/api/git/GitCliFacade.ts
@@ -20,10 +20,6 @@ export class GitCliFacade {
     await this.processRunner.run(["git", "clone", repoUrl, destDir]);
   }
 
-  async pull(repoDir: string) {
-    await this.processRunner.run(["git", "pull"], { cwd: repoDir });
-  }
-
   async getLatestTag(repoDir: string): Promise<string> {
     const result = await this.processRunner.run([
       "git",
@@ -34,6 +30,14 @@ export class GitCliFacade {
     return result.stdout.trim();
   }
 
+  async getTags(repoDir: string): Promise<string> {
+    const result = await this.processRunner.run([
+      "git",
+      "tag",
+    ], { cwd: repoDir });
+    return result.stdout.trim();
+  }
+
   async checkout(repoDir: string, tagValue: string) {
     await this.processRunner.run(["git", "checkout", tagValue], {
       cwd: repoDir,

diff --git a/src/model/CollieHub.ts b/src/model/CollieHub.ts
@@ -56,27 +56,30 @@ export class CollieHub {
       ".git",
     );
     const hasAlreadyCloned = await this.git.isRepo(hubCacheGitDir);
-    const collieHubVersion = this.config.getProperty("colliehubVersion");
+    let collieHubVersion = this.config.getProperty("colliehubVersion");
 
     if (!hasAlreadyCloned) {
       await this.git.clone(hubCacheDir, this.url);
-    } 
+    }
     if (!collieHubVersion) {
+      collieHubVersion = await this.git.getLatestTag(hubCacheDir);
+      await this.git.checkout(hubCacheDir, collieHubVersion);
+      this.config.setProperty("colliehubVersion", collieHubVersion!);
+    }
+    try {
       const latestTag = await this.git.getLatestTag(hubCacheDir);
-      await this.git.checkout(hubCacheDir, latestTag);
-      this.config.setProperty("colliehubVersion", latestTag);
-    } else if (collieHubVersion !== undefined) {
-      try {
-        const latestTag = await this.git.getLatestTag(hubCacheDir);
-        if (latestTag !== collieHubVersion) {
-          throw new Error(`version tag ${collieHubVersion} not exist`);
-        }
-      } catch (error) {
-        this.logger.error(`${error}`);
-        Deno.exit(1);
+      const allTags = await this.git.getTags(hubCacheGitDir);
+      if (!allTags.includes(latestTag)) {
+        throw new Error(
+          `version tag dont exist, possible are ${allTags} not exist`,
+        );
       }
-      await this.git.checkout(hubCacheDir, collieHubVersion);
+    } catch (error) {
+      this.logger.error(`${error}`);
+      Deno.exit(1);
     }
+    //collie-hub version is set by the if block
+    await this.git.checkout(hubCacheDir, collieHubVersion!);
 
     return hubCacheDir;
   }