actions
/
unity-builder
mirror of https://github.com/game-ci/unity-builder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixing library warning in setup step

pull/310/head
Frostebite 2022-01-02 23:44:49 +00:00
parent a9448eadbc
commit 7ea9c092fd
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/index.js vendored
View File

@ -546,7 +546,7 @@ class Caching {
if (__1.Input.cloudRunnerTests) {
cloud_runner_logger_1.default.log(`Hashed cache folder ${yield lfs_hashing_1.LFSHashing.hashAllFiles(sourceFolder)}`);
}
yield cloud_runner_system_1.CloudRunnerSystem.Run(`zip${__1.Input.cloudRunnerTests ? '' : ' -q'} -r ${cacheKey} ${path_1.default.basename(sourceFolder)}`);
yield cloud_runner_system_1.CloudRunnerSystem.Run(`zip${__1.Input.cloudRunnerTests ? '' : ' -q'} -r ${cacheKey}.zip ${path_1.default.basename(sourceFolder)}`);
console_1.assert(fs_1.default.existsSync(`${cacheKey}.zip`));
console_1.assert(fs_1.default.existsSync(`${cacheFolder}`));
console_1.assert(fs_1.default.existsSync(`${sourceFolder}`));
@ -585,7 +585,7 @@ class Caching {
}
remote_client_logger_1.RemoteClientLogger.log(`cache item exists`);
console_1.assert(fs_1.default.existsSync(destinationFolder));
yield cloud_runner_system_1.CloudRunnerSystem.Run(`unzip -q ${cacheSelection} -d ${path_1.default.basename(destinationFolder)}`);
yield cloud_runner_system_1.CloudRunnerSystem.Run(`unzip -q ${cacheSelection}.zip -d ${path_1.default.basename(destinationFolder)}`);
yield cloud_runner_system_1.CloudRunnerSystem.Run(`mv ${path_1.default.basename(destinationFolder)}/* ${destinationFolder}`);
console_1.assert(fs_1.default.existsSync(`${path_1.default.join(destinationFolder, `${cacheSelection}.zip`)}`));
}
@ -812,6 +812,7 @@ const cloud_runner_system_1 = __webpack_require__(66879);
const __1 = __webpack_require__(41359);
const remote_client_logger_1 = __webpack_require__(28082);
const path_1 = __importDefault(__webpack_require__(85622));
const console_1 = __webpack_require__(57082);
class SetupCloudRunnerRepository {
static run() {
return __awaiter(this, void 0, void 0, function* () {
@ -844,6 +845,7 @@ class SetupCloudRunnerRepository {
yield cloud_runner_system_1.CloudRunnerSystem.Run(`git lfs install --skip-smudge`);
yield cloud_runner_system_1.CloudRunnerSystem.Run(`git clone ${cloud_runner_state_1.CloudRunnerState.targetBuildRepoUrl} ${path_1.default.basename(cloud_runner_state_1.CloudRunnerState.repoPathFull)}`);
process.chdir(`${cloud_runner_state_1.CloudRunnerState.repoPathFull}`);
console_1.assert(fs_1.default.existsSync(`.git`));
if (__1.Input.cloudRunnerTests) {
yield cloud_runner_system_1.CloudRunnerSystem.Run(`ls -lh`);
yield cloud_runner_system_1.CloudRunnerSystem.Run(`tree`);

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
src/model/cli/remote-client/remote-client-services/caching.ts
View File

@ -21,7 +21,7 @@ export class Caching {
}
await CloudRunnerSystem.Run(
`zip${Input.cloudRunnerTests ? '' : ' -q'} -r ${cacheKey} ${path.basename(sourceFolder)}`,
`zip${Input.cloudRunnerTests ? '' : ' -q'} -r ${cacheKey}.zip ${path.basename(sourceFolder)}`,
);
assert(fs.existsSync(`${cacheKey}.zip`));
assert(fs.existsSync(`${cacheFolder}`));
@ -64,7 +64,7 @@ export class Caching {
}
RemoteClientLogger.log(`cache item exists`);
assert(fs.existsSync(destinationFolder));
await CloudRunnerSystem.Run(`unzip -q ${cacheSelection} -d ${path.basename(destinationFolder)}`);
await CloudRunnerSystem.Run(`unzip -q ${cacheSelection}.zip -d ${path.basename(destinationFolder)}`);
await CloudRunnerSystem.Run(`mv ${path.basename(destinationFolder)}/* ${destinationFolder}`);
assert(fs.existsSync(`${path.join(destinationFolder, `${cacheSelection}.zip`)}`));
} else {

2
src/model/cli/remote-client/setup-cloud-runner-repository.ts
View File

@ -6,6 +6,7 @@ import { CloudRunnerSystem } from './remote-client-services/cloud-runner-system'
import { Input } from '../..';
import { RemoteClientLogger } from './remote-client-services/remote-client-logger';
import path from 'path';
import { assert } from 'console';
export class SetupCloudRunnerRepository {
public static async run() {
@ -47,6 +48,7 @@ export class SetupCloudRunnerRepository {
`git clone ${CloudRunnerState.targetBuildRepoUrl} ${path.basename(CloudRunnerState.repoPathFull)}`,
);
process.chdir(`${CloudRunnerState.repoPathFull}`);
assert(fs.existsSync(`.git`));
if (Input.cloudRunnerTests) {
await CloudRunnerSystem.Run(`ls -lh`);
await CloudRunnerSystem.Run(`tree`);