unity/unity-builder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: retained workspaces must fetch before resetting to needed commit (#476)

Browse Source
This commit is contained in:
Frostebite
2022-11-18 20:43:52 +00:00
committed by GitHub
parent d6ac850da1
commit 2a32a9d870
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dist/index.js generated vendored
View File

@@ -4140,7 +4140,7 @@ class RemoteClient {
fs_1.default.existsSync(path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.repoPathAbsolute, `.git`))) {
process.chdir(cloud_runner_folders_1.CloudRunnerFolders.repoPathAbsolute);
remote_client_logger_1.RemoteClientLogger.log(`${cloud_runner_folders_1.CloudRunnerFolders.repoPathAbsolute} repo exists - skipping clone - retained workspace mode ${cloud_runner_1.default.buildParameters.retainWorkspace}`);
yield cloud_runner_system_1.CloudRunnerSystem.Run(`git reset --hard ${cloud_runner_1.default.buildParameters.gitSha}`);
yield cloud_runner_system_1.CloudRunnerSystem.Run(`git fetch && git reset --hard ${cloud_runner_1.default.buildParameters.gitSha}`);
return;
}
if (fs_1.default.existsSync(cloud_runner_folders_1.CloudRunnerFolders.repoPathAbsolute)) {
@@ -4173,7 +4173,7 @@ class RemoteClient {
if (cloud_runner_1.default.buildParameters.useSharedLargePackages) {
const filePath = path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.projectPathAbsolute, `Packages/manifest.json`);
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);
if (cloud_runner_1.default.buildParameters.cloudRunnerDebug) {
cloud_runner_logger_1.default.log(`Package Manifest`);
@@ -4459,6 +4459,7 @@ const path_1 = __importDefault(__nccwpck_require__(71017));
const fs = __importStar(__nccwpck_require__(57147));
const input_1 = __importDefault(__nccwpck_require__(91933));
const cloud_runner_options_1 = __importDefault(__nccwpck_require__(96552));
const cloud_runner_logger_1 = __importDefault(__nccwpck_require__(22855));
class CloudRunnerCustomSteps {
static GetCustomStepsFromFiles(hookLifecycle) {
const results = [];
@@ -4573,6 +4574,7 @@ class CloudRunnerCustomSteps {
});
}
static ParseSteps(steps) {
var _a;
if (steps === '') {
return [];
}
@@ -4580,6 +4582,9 @@ class CloudRunnerCustomSteps {
// CloudRunnerLogger.log(`Parsing build steps: ${steps}`);
// }
const isArray = steps.replace(/\s/g, ``)[0] === `-`;
if ((_a = cloud_runner_1.default.buildParameters) === null || _a === void 0 ? void 0 : _a.cloudRunnerDebug) {
cloud_runner_logger_1.default.log(`Parsing: ${steps}`);
}
const object = isArray ? yaml_1.default.parse(steps) : [yaml_1.default.parse(steps)];
for (const step of object) {
CloudRunnerCustomSteps.ConvertYamlSecrets(step);