Skip to content

Commit dd42746

Browse files
authored
Hotfix: Fix version checking in image-tag (#640)
* Update version check regex and fix tests
1 parent 0c16aab commit dd42746

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

dist/index.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/model/image-tag.test.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import ImageTag from './image-tag';
22

33
describe('ImageTag', () => {
44
const testImageParameters = {
5-
editorVersion: '2099.9.f9f9',
5+
editorVersion: '2099.9.9f9',
66
targetPlatform: 'Test',
77
builderPlatform: '',
88
containerRegistryRepository: 'unityci/editor',
@@ -27,7 +27,7 @@ describe('ImageTag', () => {
2727
expect(image.builderPlatform).toStrictEqual(testImageParameters.builderPlatform);
2828
});
2929

30-
test.each(['2000.0.0f0', '2011.1.11f1'])('accepts %p version format', (version) => {
30+
test.each(['2000.0.0f0', '2011.1.11f1', '6000.0.0f1'])('accepts %p version format', (version) => {
3131
expect(
3232
() =>
3333
new ImageTag({
@@ -50,23 +50,23 @@ describe('ImageTag', () => {
5050
describe('toString', () => {
5151
it('returns the correct version', () => {
5252
const image = new ImageTag({
53-
editorVersion: '2099.1.1111',
53+
editorVersion: '2099.1.1111f1',
5454
targetPlatform: testImageParameters.targetPlatform,
5555
containerRegistryRepository: 'unityci/editor',
5656
containerRegistryImageVersion: '3',
5757
});
5858
switch (process.platform) {
5959
case 'win32':
60-
expect(image.toString()).toStrictEqual(`${defaults.image}:windows-2099.1.1111-3`);
60+
expect(image.toString()).toStrictEqual(`${defaults.image}:windows-2099.1.1111f1-3`);
6161
break;
6262
case 'linux':
63-
expect(image.toString()).toStrictEqual(`${defaults.image}:ubuntu-2099.1.1111-3`);
63+
expect(image.toString()).toStrictEqual(`${defaults.image}:ubuntu-2099.1.1111f1-3`);
6464
break;
6565
}
6666
});
6767
it('returns customImage if given', () => {
6868
const image = new ImageTag({
69-
editorVersion: '2099.1.1111',
69+
editorVersion: '2099.1.1111f1',
7070
targetPlatform: testImageParameters.targetPlatform,
7171
customImage: `${defaults.image}:2099.1.1111@347598437689743986`,
7272
containerRegistryRepository: 'unityci/editor',

src/model/image-tag.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class ImageTag {
4242
}
4343

4444
static get versionPattern(): RegExp {
45-
return /^(20\d{2}\.\d\.\w{3,4}|3)$/;
45+
return /^\d+\.\d+\.\d+[a-z]\d+$/;
4646
}
4747

4848
static get targetPlatformSuffixes() {

0 commit comments

Comments
 (0)