Do not checkout with git sha if undefined
parent
73506a2f0a
commit
36ecc47c3c
|
|
@ -1096,6 +1096,7 @@ class CloudRunner {
|
||||||
core.endGroup();
|
core.endGroup();
|
||||||
const content = Object.assign({}, CloudRunner.buildParameters);
|
const content = Object.assign({}, CloudRunner.buildParameters);
|
||||||
content.gitPrivateToken = ``;
|
content.gitPrivateToken = ``;
|
||||||
|
content.unitySerial = ``;
|
||||||
const jsonContent = JSON.stringify(content, undefined, 4);
|
const jsonContent = JSON.stringify(content, undefined, 4);
|
||||||
yield github_1.default.updateGitHubCheck(jsonContent, CloudRunner.buildParameters.buildGuid);
|
yield github_1.default.updateGitHubCheck(jsonContent, CloudRunner.buildParameters.buildGuid);
|
||||||
const output = yield new workflow_composition_root_1.WorkflowCompositionRoot().run(new cloud_runner_step_state_1.CloudRunnerStepState(baseImage, CloudRunner.cloudRunnerEnvironmentVariables, CloudRunner.defaultSecrets));
|
const output = yield new workflow_composition_root_1.WorkflowCompositionRoot().run(new cloud_runner_step_state_1.CloudRunnerStepState(baseImage, CloudRunner.cloudRunnerEnvironmentVariables, CloudRunner.defaultSecrets));
|
||||||
|
|
@ -4409,6 +4410,7 @@ const cloud_runner_logger_1 = __importDefault(__nccwpck_require__(22855));
|
||||||
const cli_functions_repository_1 = __nccwpck_require__(85301);
|
const cli_functions_repository_1 = __nccwpck_require__(85301);
|
||||||
const cloud_runner_system_1 = __nccwpck_require__(99393);
|
const cloud_runner_system_1 = __nccwpck_require__(99393);
|
||||||
const yaml_1 = __importDefault(__nccwpck_require__(44603));
|
const yaml_1 = __importDefault(__nccwpck_require__(44603));
|
||||||
|
const github_1 = __importDefault(__nccwpck_require__(83654));
|
||||||
class RemoteClient {
|
class RemoteClient {
|
||||||
static bootstrapRepository() {
|
static bootstrapRepository() {
|
||||||
return __awaiter(this, void 0, void 0, function* () {
|
return __awaiter(this, void 0, void 0, function* () {
|
||||||
|
|
@ -4471,7 +4473,12 @@ class RemoteClient {
|
||||||
console_1.assert(fs_1.default.existsSync(`.git`), 'git folder exists');
|
console_1.assert(fs_1.default.existsSync(`.git`), 'git folder exists');
|
||||||
remote_client_logger_1.RemoteClientLogger.log(`${cloud_runner_1.default.buildParameters.branch}`);
|
remote_client_logger_1.RemoteClientLogger.log(`${cloud_runner_1.default.buildParameters.branch}`);
|
||||||
yield cloud_runner_system_1.CloudRunnerSystem.Run(`git checkout ${cloud_runner_1.default.buildParameters.branch}`);
|
yield cloud_runner_system_1.CloudRunnerSystem.Run(`git checkout ${cloud_runner_1.default.buildParameters.branch}`);
|
||||||
yield cloud_runner_system_1.CloudRunnerSystem.Run(`git checkout ${cloud_runner_1.default.buildParameters.gitSha}`);
|
if (cloud_runner_1.default.buildParameters.gitSha !== undefined) {
|
||||||
|
yield cloud_runner_system_1.CloudRunnerSystem.Run(`git checkout ${cloud_runner_1.default.buildParameters.gitSha}`);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
remote_client_logger_1.RemoteClientLogger.log(`buildParameter Git Sha is empty`);
|
||||||
|
}
|
||||||
console_1.assert(fs_1.default.existsSync(path_1.default.join(`.git`, `lfs`)), 'LFS folder should not exist before caching');
|
console_1.assert(fs_1.default.existsSync(path_1.default.join(`.git`, `lfs`)), 'LFS folder should not exist before caching');
|
||||||
remote_client_logger_1.RemoteClientLogger.log(`Checked out ${cloud_runner_1.default.buildParameters.branch}`);
|
remote_client_logger_1.RemoteClientLogger.log(`Checked out ${cloud_runner_1.default.buildParameters.branch}`);
|
||||||
}
|
}
|
||||||
|
|
@ -4484,14 +4491,15 @@ class RemoteClient {
|
||||||
static replaceLargePackageReferencesWithSharedReferences() {
|
static replaceLargePackageReferencesWithSharedReferences() {
|
||||||
return __awaiter(this, void 0, void 0, function* () {
|
return __awaiter(this, void 0, void 0, function* () {
|
||||||
cloud_runner_logger_1.default.log(`Use Shared Pkgs ${cloud_runner_1.default.buildParameters.useSharedLargePackages}`);
|
cloud_runner_logger_1.default.log(`Use Shared Pkgs ${cloud_runner_1.default.buildParameters.useSharedLargePackages}`);
|
||||||
|
github_1.default.updateGitHubCheck(`Use Shared Pkgs ${cloud_runner_1.default.buildParameters.useSharedLargePackages}`, ``);
|
||||||
if (cloud_runner_1.default.buildParameters.useSharedLargePackages) {
|
if (cloud_runner_1.default.buildParameters.useSharedLargePackages) {
|
||||||
yield cloud_runner_system_1.CloudRunnerSystem.Run(`tree -L 2 ${cloud_runner_folders_1.CloudRunnerFolders.projectPathAbsolute}`);
|
yield cloud_runner_system_1.CloudRunnerSystem.Run(`tree -L 2 ${cloud_runner_folders_1.CloudRunnerFolders.projectPathAbsolute}`);
|
||||||
const filePath = path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.projectPathAbsolute, `Packages/manifest.json`);
|
const filePath = path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.projectPathAbsolute, `Packages/manifest.json`);
|
||||||
let manifest = fs_1.default.readFileSync(filePath, 'utf8');
|
let manifest = fs_1.default.readFileSync(filePath, 'utf8');
|
||||||
manifest = manifest.replace(/LargeContent/g, '../../../LargeContent');
|
manifest = manifest.replace(/LargeContent/g, '../../../LargeContent');
|
||||||
fs_1.default.writeFileSync(filePath, manifest);
|
fs_1.default.writeFileSync(filePath, manifest);
|
||||||
cloud_runner_logger_1.default.log(`Package Manifest`);
|
cloud_runner_logger_1.default.log(`Package Manifest \n ${manifest}`);
|
||||||
cloud_runner_logger_1.default.log(manifest);
|
github_1.default.updateGitHubCheck(`Package Manifest \n ${manifest}`, ``);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -5416,6 +5424,12 @@ class FollowLogStreamService {
|
||||||
else if (message.toLowerCase().includes('error ')) {
|
else if (message.toLowerCase().includes('error ')) {
|
||||||
FollowLogStreamService.errors += `\n${message}`;
|
FollowLogStreamService.errors += `\n${message}`;
|
||||||
}
|
}
|
||||||
|
else if (message.toLowerCase().includes('command failed: ')) {
|
||||||
|
FollowLogStreamService.errors += `\n${message}`;
|
||||||
|
}
|
||||||
|
else if (message.toLowerCase().includes('error: ')) {
|
||||||
|
FollowLogStreamService.errors += `\n${message}`;
|
||||||
|
}
|
||||||
else if (message.toLowerCase().includes('invalid ')) {
|
else if (message.toLowerCase().includes('invalid ')) {
|
||||||
FollowLogStreamService.errors += `\n${message}`;
|
FollowLogStreamService.errors += `\n${message}`;
|
||||||
}
|
}
|
||||||
|
|
@ -6514,6 +6528,12 @@ class GitHub {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
GitHub.longDescriptionContent += `\n${longDescription}`;
|
GitHub.longDescriptionContent += `\n${longDescription}`;
|
||||||
|
if (GitHub.result === ``) {
|
||||||
|
GitHub.result = result;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
result = GitHub.result;
|
||||||
|
}
|
||||||
const data = {
|
const data = {
|
||||||
owner: GitHub.owner,
|
owner: GitHub.owner,
|
||||||
repo: GitHub.repo,
|
repo: GitHub.repo,
|
||||||
|
|
@ -6596,6 +6616,7 @@ class GitHub {
|
||||||
GitHub.asyncChecksApiWorkflowName = `Async Checks API`;
|
GitHub.asyncChecksApiWorkflowName = `Async Checks API`;
|
||||||
GitHub.githubInputEnabled = true;
|
GitHub.githubInputEnabled = true;
|
||||||
GitHub.longDescriptionContent = ``;
|
GitHub.longDescriptionContent = ``;
|
||||||
|
GitHub.result = ``;
|
||||||
exports["default"] = GitHub;
|
exports["default"] = GitHub;
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -7164,8 +7185,8 @@ class Input {
|
||||||
if (Input.getInput(`GITHUB_SHA`)) {
|
if (Input.getInput(`GITHUB_SHA`)) {
|
||||||
return Input.getInput(`GITHUB_SHA`);
|
return Input.getInput(`GITHUB_SHA`);
|
||||||
}
|
}
|
||||||
else if (Input.getInput(`GitSHA`)) {
|
else if (Input.getInput(`GitSha`)) {
|
||||||
return Input.getInput(`GitSHA`);
|
return Input.getInput(`GitSha`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
static get useIL2Cpp() {
|
static get useIL2Cpp() {
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -114,6 +114,7 @@ class CloudRunner {
|
||||||
if (!CloudRunner.buildParameters.isCliMode) core.endGroup();
|
if (!CloudRunner.buildParameters.isCliMode) core.endGroup();
|
||||||
const content = { ...CloudRunner.buildParameters };
|
const content = { ...CloudRunner.buildParameters };
|
||||||
content.gitPrivateToken = ``;
|
content.gitPrivateToken = ``;
|
||||||
|
content.unitySerial = ``;
|
||||||
const jsonContent = JSON.stringify(content, undefined, 4);
|
const jsonContent = JSON.stringify(content, undefined, 4);
|
||||||
await GitHub.updateGitHubCheck(jsonContent, CloudRunner.buildParameters.buildGuid);
|
await GitHub.updateGitHubCheck(jsonContent, CloudRunner.buildParameters.buildGuid);
|
||||||
const output = await new WorkflowCompositionRoot().run(
|
const output = await new WorkflowCompositionRoot().run(
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ import CloudRunnerLogger from '../services/cloud-runner-logger';
|
||||||
import { CliFunction } from '../../cli/cli-functions-repository';
|
import { CliFunction } from '../../cli/cli-functions-repository';
|
||||||
import { CloudRunnerSystem } from '../services/cloud-runner-system';
|
import { CloudRunnerSystem } from '../services/cloud-runner-system';
|
||||||
import YAML from 'yaml';
|
import YAML from 'yaml';
|
||||||
|
import GitHub from '../../github';
|
||||||
|
|
||||||
export class RemoteClient {
|
export class RemoteClient {
|
||||||
public static async bootstrapRepository() {
|
public static async bootstrapRepository() {
|
||||||
|
|
@ -95,7 +96,12 @@ export class RemoteClient {
|
||||||
assert(fs.existsSync(`.git`), 'git folder exists');
|
assert(fs.existsSync(`.git`), 'git folder exists');
|
||||||
RemoteClientLogger.log(`${CloudRunner.buildParameters.branch}`);
|
RemoteClientLogger.log(`${CloudRunner.buildParameters.branch}`);
|
||||||
await CloudRunnerSystem.Run(`git checkout ${CloudRunner.buildParameters.branch}`);
|
await CloudRunnerSystem.Run(`git checkout ${CloudRunner.buildParameters.branch}`);
|
||||||
await CloudRunnerSystem.Run(`git checkout ${CloudRunner.buildParameters.gitSha}`);
|
if (CloudRunner.buildParameters.gitSha !== undefined) {
|
||||||
|
await CloudRunnerSystem.Run(`git checkout ${CloudRunner.buildParameters.gitSha}`);
|
||||||
|
} else {
|
||||||
|
RemoteClientLogger.log(`buildParameter Git Sha is empty`);
|
||||||
|
}
|
||||||
|
|
||||||
assert(fs.existsSync(path.join(`.git`, `lfs`)), 'LFS folder should not exist before caching');
|
assert(fs.existsSync(path.join(`.git`, `lfs`)), 'LFS folder should not exist before caching');
|
||||||
RemoteClientLogger.log(`Checked out ${CloudRunner.buildParameters.branch}`);
|
RemoteClientLogger.log(`Checked out ${CloudRunner.buildParameters.branch}`);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
|
@ -106,14 +112,15 @@ export class RemoteClient {
|
||||||
|
|
||||||
static async replaceLargePackageReferencesWithSharedReferences() {
|
static async replaceLargePackageReferencesWithSharedReferences() {
|
||||||
CloudRunnerLogger.log(`Use Shared Pkgs ${CloudRunner.buildParameters.useSharedLargePackages}`);
|
CloudRunnerLogger.log(`Use Shared Pkgs ${CloudRunner.buildParameters.useSharedLargePackages}`);
|
||||||
|
GitHub.updateGitHubCheck(`Use Shared Pkgs ${CloudRunner.buildParameters.useSharedLargePackages}`, ``);
|
||||||
if (CloudRunner.buildParameters.useSharedLargePackages) {
|
if (CloudRunner.buildParameters.useSharedLargePackages) {
|
||||||
await CloudRunnerSystem.Run(`tree -L 2 ${CloudRunnerFolders.projectPathAbsolute}`);
|
await CloudRunnerSystem.Run(`tree -L 2 ${CloudRunnerFolders.projectPathAbsolute}`);
|
||||||
const filePath = path.join(CloudRunnerFolders.projectPathAbsolute, `Packages/manifest.json`);
|
const filePath = path.join(CloudRunnerFolders.projectPathAbsolute, `Packages/manifest.json`);
|
||||||
let manifest = fs.readFileSync(filePath, 'utf8');
|
let manifest = fs.readFileSync(filePath, 'utf8');
|
||||||
manifest = manifest.replace(/LargeContent/g, '../../../LargeContent');
|
manifest = manifest.replace(/LargeContent/g, '../../../LargeContent');
|
||||||
fs.writeFileSync(filePath, manifest);
|
fs.writeFileSync(filePath, manifest);
|
||||||
CloudRunnerLogger.log(`Package Manifest`);
|
CloudRunnerLogger.log(`Package Manifest \n ${manifest}`);
|
||||||
CloudRunnerLogger.log(manifest);
|
GitHub.updateGitHubCheck(`Package Manifest \n ${manifest}`, ``);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -29,6 +29,10 @@ export class FollowLogStreamService {
|
||||||
core.error('BUILD FAILED!');
|
core.error('BUILD FAILED!');
|
||||||
} else if (message.toLowerCase().includes('error ')) {
|
} else if (message.toLowerCase().includes('error ')) {
|
||||||
FollowLogStreamService.errors += `\n${message}`;
|
FollowLogStreamService.errors += `\n${message}`;
|
||||||
|
} else if (message.toLowerCase().includes('command failed: ')) {
|
||||||
|
FollowLogStreamService.errors += `\n${message}`;
|
||||||
|
} else if (message.toLowerCase().includes('error: ')) {
|
||||||
|
FollowLogStreamService.errors += `\n${message}`;
|
||||||
} else if (message.toLowerCase().includes('invalid ')) {
|
} else if (message.toLowerCase().includes('invalid ')) {
|
||||||
FollowLogStreamService.errors += `\n${message}`;
|
FollowLogStreamService.errors += `\n${message}`;
|
||||||
} else if (message.toLowerCase().includes('incompatible ')) {
|
} else if (message.toLowerCase().includes('incompatible ')) {
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@ class GitHub {
|
||||||
private static longDescriptionContent: string = ``;
|
private static longDescriptionContent: string = ``;
|
||||||
private static startedDate: string;
|
private static startedDate: string;
|
||||||
private static endedDate: string;
|
private static endedDate: string;
|
||||||
|
static result: string = ``;
|
||||||
private static get octokitDefaultToken() {
|
private static get octokitDefaultToken() {
|
||||||
return new Octokit({
|
return new Octokit({
|
||||||
auth: process.env.GITHUB_TOKEN,
|
auth: process.env.GITHUB_TOKEN,
|
||||||
|
|
@ -85,7 +86,11 @@ class GitHub {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
GitHub.longDescriptionContent += `\n${longDescription}`;
|
GitHub.longDescriptionContent += `\n${longDescription}`;
|
||||||
|
if (GitHub.result === ``) {
|
||||||
|
GitHub.result = result;
|
||||||
|
} else {
|
||||||
|
result = GitHub.result;
|
||||||
|
}
|
||||||
const data: any = {
|
const data: any = {
|
||||||
owner: GitHub.owner,
|
owner: GitHub.owner,
|
||||||
repo: GitHub.repo,
|
repo: GitHub.repo,
|
||||||
|
|
|
||||||
|
|
@ -64,8 +64,8 @@ class Input {
|
||||||
static get gitSha() {
|
static get gitSha() {
|
||||||
if (Input.getInput(`GITHUB_SHA`)) {
|
if (Input.getInput(`GITHUB_SHA`)) {
|
||||||
return Input.getInput(`GITHUB_SHA`);
|
return Input.getInput(`GITHUB_SHA`);
|
||||||
} else if (Input.getInput(`GitSHA`)) {
|
} else if (Input.getInput(`GitSha`)) {
|
||||||
return Input.getInput(`GitSHA`);
|
return Input.getInput(`GitSha`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue