feat: upgrade to images of version 1 (rolling tag) (#84)

game-ci · Apr 3, 2022 · 2338dd0 · 2338dd0
1 parent 51c34e4
commit 2338dd0
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 13 deletions.
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -8,4 +8,6 @@ fi
 yarn lint-staged
 yarn lint
 yarn test
+
 yarn build
+git add dist
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/model/image-tag.test.ts b/src/model/image-tag.test.ts
@@ -16,7 +16,7 @@ describe('ImageTag', () => {
     it('returns the correct version', () => {
       const image = new ImageTag('2099.1.1111', '');
 
-      expect(image.toString()).toStrictEqual(`unityci/editor:2099.1.1111-linux-il2cpp-0`);
+      expect(image.toString()).toStrictEqual(`unityci/editor:ubuntu-2099.1.1111-linux-il2cpp-1`);
     });
   });
 });
diff --git a/src/model/image-tag.ts b/src/model/image-tag.ts
@@ -103,7 +103,11 @@ class ImageTag {
   }
 
   get tag() {
-    return `${this.version}-${this.builderPlatform}`.replace(/-+$/, '');
+    const dockerRepoVersion = 1;
+
+    const versionAndTargetPlatform = `${this.version}-${this.builderPlatform}`.replace(/-+$/, '');
+
+    return `ubuntu-${versionAndTargetPlatform}-${dockerRepoVersion}`;
   }
 
   get image() {
@@ -113,12 +117,9 @@ class ImageTag {
   toString() {
     const { image, tag, customImage } = this;
 
-    if (customImage && customImage !== '') {
-      return customImage;
-    }
+    if (customImage) return customImage;
 
-    const dockerRepoVersion = 0;
-    return `${image}:${tag}-${dockerRepoVersion}`;
+    return `${image}:${tag}`;
   }
 }