Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
frostebite committed Jan 19, 2024
1 parent cdd1bd2 commit 74ad7d8
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 19 deletions.
15 changes: 8 additions & 7 deletions dist/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/index.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/model/cloud-runner/options/cloud-runner-options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,14 +103,14 @@ class CloudRunnerOptions {

static get buildPlatform(): string {
const input = CloudRunnerOptions.getInput('buildPlatform');
if (input) {
if (input && input !== '') {
return input;
}
if (CloudRunnerOptions.providerStrategy !== 'local') {
return 'linux';
}

return ``;
return process.platform;
}

static get cloudRunnerBranch(): string {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,28 @@ async function CreateParameters(overrides: any) {
describe('Cloud Runner Kubernetes', () => {
it('Responds', () => {});
setups();

if (CloudRunnerOptions.cloudRunnerDebug) {
it('Run one build it using K8s without error', async () => {
if (CloudRunnerOptions.providerStrategy !== `k8s`) {
return;
}
process.env.USE_IL2CPP = 'false';
const overrides = {
versioning: 'None',
projectPath: 'test-project',
unityVersion: UnityVersioning.determineUnityVersion('test-project', UnityVersioning.read('test-project')),
targetPlatform: 'StandaloneLinux64',
cacheKey: `test-case-${uuidv4()}`,
providerStrategy: 'k8s',
buildPlatform: 'linux',
};
const buildParameter = await CreateParameters(overrides);
expect(buildParameter.projectPath).toEqual(overrides.projectPath);

const baseImage = new ImageTag(buildParameter);
const results = await CloudRunner.run(buildParameter, baseImage.toString());
const resultsObject = await CloudRunner.run(buildParameter, baseImage.toString());
const results = resultsObject.BuildResults;
const libraryString = 'Rebuilding Library because the asset database could not be found!';
const cachePushFail = 'Did not push source folder to cache because it was empty Library';
const buildSucceededString = 'Build succeeded';
Expand Down
15 changes: 7 additions & 8 deletions src/model/image-tag.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import Platform from './platform';

class ImageTag {
public repository: string;
public cloudRunnerBuilderPlatform!: string;
public editorVersion: string;
public targetPlatform: string;
public builderPlatform: string;
Expand All @@ -15,7 +14,7 @@ class ImageTag {
editorVersion,
targetPlatform,
customImage,
cloudRunnerBuilderPlatform,
buildPlatform,
containerRegistryRepository,
containerRegistryImageVersion,
} = imageProperties;
Expand All @@ -32,12 +31,8 @@ class ImageTag {
this.repository = containerRegistryRepository;
this.editorVersion = editorVersion;
this.targetPlatform = targetPlatform;
this.cloudRunnerBuilderPlatform = cloudRunnerBuilderPlatform;
const isCloudRunnerLocal = cloudRunnerBuilderPlatform === 'local' || cloudRunnerBuilderPlatform === undefined;
this.builderPlatform = ImageTag.getTargetPlatformToTargetPlatformSuffixMap(targetPlatform, editorVersion);
this.imagePlatformPrefix = ImageTag.getImagePlatformPrefixes(
isCloudRunnerLocal ? process.platform : cloudRunnerBuilderPlatform,
);
this.imagePlatformPrefix = ImageTag.getImagePlatformPrefixes(buildPlatform);
this.imageRollingVersion = Number(containerRegistryImageVersion); // Will automatically roll to the latest non-breaking version.
}

Expand All @@ -63,6 +58,10 @@ class ImageTag {
}

static getImagePlatformPrefixes(platform: string): string {
if (!platform || platform === '') {
platform = process.platform;
}

switch (platform) {
case 'win32':
return 'windows';
Expand Down Expand Up @@ -101,7 +100,7 @@ class ImageTag {
return windows;
case Platform.types.StandaloneLinux64: {
// Unity versions before 2019.3 do not support il2cpp
if (major >= 2020 || (major === 2019 && minor >= 3)) {
if (process.env.USE_IL2CPP === 'true' && (major >= 2020 || (major === 2019 && minor >= 3))) {
return linuxIl2cpp;
}

Expand Down

0 comments on commit 74ad7d8

Please sign in to comment.