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

review comments

pull/524/head
Frostebite 2023-03-19 01:19:46 +00:00
parent cb3f6df834
commit c966c35348
7 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dist/index.js vendored
View File

@ -1698,7 +1698,7 @@ class AWSTaskRunner {
cloud_runner_logger_1.default.log(`Streaming...`); cloud_runner_logger_1.default.log(`Streaming...`);
const stream = await AWSTaskRunner.getLogStream(kinesisStreamName); const stream = await AWSTaskRunner.getLogStream(kinesisStreamName);
let iterator = await AWSTaskRunner.getLogIterator(stream); let iterator = await AWSTaskRunner.getLogIterator(stream);
const logBaseUrl = `https://${__1.Input.region}.console.aws.amazon.com/cloudwatch/home?region=${__1.Input.region}#logsV2:log-groups/log-group/${cloud_runner_1.default.buildParameters.awsBaseStackName}${AWSTaskRunner.encodedUnderscore}${cloud_runner_1.default.buildParameters.awsBaseStackName}-${cloud_runner_1.default.buildParameters.buildGuid}`; const logBaseUrl = `https://${__1.Input.region}.console.aws.amazon.com/cloudwatch/home?region=${__1.Input.region}#logsV2:log-groups/log-group/${cloud_runner_1.default.buildParameters.awsStackName}${AWSTaskRunner.encodedUnderscore}${cloud_runner_1.default.buildParameters.awsStackName}-${cloud_runner_1.default.buildParameters.buildGuid}`;
cloud_runner_logger_1.default.log(`You view the log stream on AWS Cloud Watch: ${logBaseUrl}`); cloud_runner_logger_1.default.log(`You view the log stream on AWS Cloud Watch: ${logBaseUrl}`);
await github_1.default.updateGitHubCheck(`You view the log stream on AWS Cloud Watch: ${logBaseUrl}`, ``); await github_1.default.updateGitHubCheck(`You view the log stream on AWS Cloud Watch: ${logBaseUrl}`, ``);
let shouldReadLogs = true; let shouldReadLogs = true;
@ -2863,7 +2863,7 @@ class TaskService {
process.env.AWS_REGION = input_1.default.region; process.env.AWS_REGION = input_1.default.region;
const s3 = new aws_sdk_1.default.S3(); const s3 = new aws_sdk_1.default.S3();
const listRequest = { const listRequest = {
Bucket: cloud_runner_1.default.buildParameters.awsBaseStackName, Bucket: cloud_runner_1.default.buildParameters.awsStackName,
}; };
const results = await s3.listObjects(listRequest).promise(); const results = await s3.listObjects(listRequest).promise();
return results.Contents || []; return results.Contents || [];
@ -4585,7 +4585,7 @@ class CloudRunnerCustomSteps {
aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default
aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default
aws configure set region $AWS_DEFAULT_REGION --profile default aws configure set region $AWS_DEFAULT_REGION --profile default
aws s3 cp /data/cache/$CI_CACHE_KEY/build/build-${cloud_runner_1.default.buildParameters.buildGuid}.tar${cloud_runner_1.default.buildParameters.compressionStrategy ? '.lz4' : ''} s3://${cloud_runner_1.default.buildParameters.awsBaseStackName}/cloud-runner-cache/$CI_CACHE_KEY/build/build-$BUILD_GUID.tar${cloud_runner_1.default.buildParameters.compressionStrategy ? '.lz4' : ''} aws s3 cp /data/cache/$CI_CACHE_KEY/build/build-${cloud_runner_1.default.buildParameters.buildGuid}.tar${cloud_runner_1.default.buildParameters.compressionStrategy ? '.lz4' : ''} s3://${cloud_runner_1.default.buildParameters.awsStackName}/cloud-runner-cache/$CI_CACHE_KEY/build/build-$BUILD_GUID.tar${cloud_runner_1.default.buildParameters.compressionStrategy ? '.lz4' : ''}
rm /data/cache/$CI_CACHE_KEY/build/build-${cloud_runner_1.default.buildParameters.buildGuid}.tar${cloud_runner_1.default.buildParameters.compressionStrategy ? '.lz4' : ''} rm /data/cache/$CI_CACHE_KEY/build/build-${cloud_runner_1.default.buildParameters.buildGuid}.tar${cloud_runner_1.default.buildParameters.compressionStrategy ? '.lz4' : ''}
secrets: secrets:
- name: awsAccessKeyId - name: awsAccessKeyId
@ -4600,9 +4600,9 @@ class CloudRunnerCustomSteps {
aws configure set aws_access_key_id $CI_AWS_ACCESS_KEY_ID --profile default aws configure set aws_access_key_id $CI_AWS_ACCESS_KEY_ID --profile default
aws configure set aws_secret_access_key $CI_AWS_SECRET_ACCESS_KEY --profile default aws configure set aws_secret_access_key $CI_AWS_SECRET_ACCESS_KEY --profile default
aws configure set region $CI_AWS_DEFAULT_REGION --profile default aws configure set region $CI_AWS_DEFAULT_REGION --profile default
aws s3 ls ${cloud_runner_1.default.buildParameters.awsBaseStackName}/cloud-runner-cache/ || true aws s3 ls ${cloud_runner_1.default.buildParameters.awsStackName}/cloud-runner-cache/ || true
aws s3 ls ${cloud_runner_1.default.buildParameters.awsBaseStackName}/cloud-runner-cache/$CI_CACHE_KEY/build || true aws s3 ls ${cloud_runner_1.default.buildParameters.awsStackName}/cloud-runner-cache/$CI_CACHE_KEY/build || true
aws s3 cp s3://${cloud_runner_1.default.buildParameters.awsBaseStackName}/cloud-runner-cache/$CI_CACHE_KEY/build/build-$BUILD_GUID_TARGET.tar${cloud_runner_1.default.buildParameters.compressionStrategy ? '.lz4' : ''} /data/cache/$CI_CACHE_KEY/build/build-$BUILD_GUID_TARGET.tar${cloud_runner_1.default.buildParameters.compressionStrategy ? '.lz4' : ''} aws s3 cp s3://${cloud_runner_1.default.buildParameters.awsStackName}/cloud-runner-cache/$CI_CACHE_KEY/build/build-$BUILD_GUID_TARGET.tar${cloud_runner_1.default.buildParameters.compressionStrategy ? '.lz4' : ''} /data/cache/$CI_CACHE_KEY/build/build-$BUILD_GUID_TARGET.tar${cloud_runner_1.default.buildParameters.compressionStrategy ? '.lz4' : ''}
secrets: secrets:
- name: CI_AWS_ACCESS_KEY_ID - name: CI_AWS_ACCESS_KEY_ID
- name: CI_AWS_SECRET_ACCESS_KEY - name: CI_AWS_SECRET_ACCESS_KEY
@ -4651,9 +4651,9 @@ class CloudRunnerCustomSteps {
aws configure set aws_access_key_id $CI_AWS_ACCESS_KEY_ID --profile default aws configure set aws_access_key_id $CI_AWS_ACCESS_KEY_ID --profile default
aws configure set aws_secret_access_key $CI_AWS_SECRET_ACCESS_KEY --profile default aws configure set aws_secret_access_key $CI_AWS_SECRET_ACCESS_KEY --profile default
aws configure set region $CI_AWS_DEFAULT_REGION --profile default aws configure set region $CI_AWS_DEFAULT_REGION --profile default
aws s3 cp --recursive /data/cache/$CI_CACHE_KEY/lfs s3://${cloud_runner_1.default.buildParameters.awsBaseStackName}/cloud-runner-cache/$CI_CACHE_KEY/lfs aws s3 cp --recursive /data/cache/$CI_CACHE_KEY/lfs s3://${cloud_runner_1.default.buildParameters.awsStackName}/cloud-runner-cache/$CI_CACHE_KEY/lfs
rm -r /data/cache/$CI_CACHE_KEY/lfs rm -r /data/cache/$CI_CACHE_KEY/lfs
aws s3 cp --recursive /data/cache/$CI_CACHE_KEY/Library s3://${cloud_runner_1.default.buildParameters.awsBaseStackName}/cloud-runner-cache/$CI_CACHE_KEY/Library aws s3 cp --recursive /data/cache/$CI_CACHE_KEY/Library s3://${cloud_runner_1.default.buildParameters.awsStackName}/cloud-runner-cache/$CI_CACHE_KEY/Library
rm -r /data/cache/$CI_CACHE_KEY/Library rm -r /data/cache/$CI_CACHE_KEY/Library
secrets: secrets:
- name: CI_AWS_ACCESS_KEY_ID - name: CI_AWS_ACCESS_KEY_ID
@ -4669,13 +4669,13 @@ class CloudRunnerCustomSteps {
aws configure set aws_access_key_id $CI_AWS_ACCESS_KEY_ID --profile default aws configure set aws_access_key_id $CI_AWS_ACCESS_KEY_ID --profile default
aws configure set aws_secret_access_key $CI_AWS_SECRET_ACCESS_KEY --profile default aws configure set aws_secret_access_key $CI_AWS_SECRET_ACCESS_KEY --profile default
aws configure set region $CI_AWS_DEFAULT_REGION --profile default aws configure set region $CI_AWS_DEFAULT_REGION --profile default
aws s3 ls ${cloud_runner_1.default.buildParameters.awsBaseStackName}/cloud-runner-cache/ || true aws s3 ls ${cloud_runner_1.default.buildParameters.awsStackName}/cloud-runner-cache/ || true
aws s3 ls ${cloud_runner_1.default.buildParameters.awsBaseStackName}/cloud-runner-cache/$CI_CACHE_KEY/ || true aws s3 ls ${cloud_runner_1.default.buildParameters.awsStackName}/cloud-runner-cache/$CI_CACHE_KEY/ || true
BUCKET1="${cloud_runner_1.default.buildParameters.awsBaseStackName}/cloud-runner-cache/$CI_CACHE_KEY/Library/" BUCKET1="${cloud_runner_1.default.buildParameters.awsStackName}/cloud-runner-cache/$CI_CACHE_KEY/Library/"
aws s3 ls $BUCKET1 || true aws s3 ls $BUCKET1 || true
OBJECT1="$(aws s3 ls $BUCKET1 | sort | tail -n 1 | awk '{print $4}' || '')" OBJECT1="$(aws s3 ls $BUCKET1 | sort | tail -n 1 | awk '{print $4}' || '')"
aws s3 cp s3://$BUCKET1$OBJECT1 /data/cache/$CI_CACHE_KEY/Library/ || true aws s3 cp s3://$BUCKET1$OBJECT1 /data/cache/$CI_CACHE_KEY/Library/ || true
BUCKET2="${cloud_runner_1.default.buildParameters.awsBaseStackName}/cloud-runner-cache/$CI_CACHE_KEY/lfs/" BUCKET2="${cloud_runner_1.default.buildParameters.awsStackName}/cloud-runner-cache/$CI_CACHE_KEY/lfs/"
aws s3 ls $BUCKET2 || true aws s3 ls $BUCKET2 || true
OBJECT2="$(aws s3 ls $BUCKET2 | sort | tail -n 1 | awk '{print $4}' || '')" OBJECT2="$(aws s3 ls $BUCKET2 | sort | tail -n 1 | awk '{print $4}' || '')"
aws s3 cp s3://$BUCKET2$OBJECT2 /data/cache/$CI_CACHE_KEY/lfs/ || true aws s3 cp s3://$BUCKET2$OBJECT2 /data/cache/$CI_CACHE_KEY/lfs/ || true
@ -5284,7 +5284,7 @@ const build_parameters_1 = __importDefault(__nccwpck_require__(80787));
const cloud_runner_1 = __importDefault(__nccwpck_require__(79144)); const cloud_runner_1 = __importDefault(__nccwpck_require__(79144));
class SharedWorkspaceLocking { class SharedWorkspaceLocking {
static get workspaceBucketRoot() { static get workspaceBucketRoot() {
return `s3://${cloud_runner_1.default.buildParameters.awsBaseStackName}/`; return `s3://${cloud_runner_1.default.buildParameters.awsStackName}/`;
} }
static get workspaceRoot() { static get workspaceRoot() {
return `${SharedWorkspaceLocking.workspaceBucketRoot}locks/`; return `${SharedWorkspaceLocking.workspaceBucketRoot}locks/`;

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
src/model/cloud-runner/providers/aws/aws-task-runner.ts
View File

@ -141,7 +141,7 @@ class AWSTaskRunner {
const stream = await AWSTaskRunner.getLogStream(kinesisStreamName); const stream = await AWSTaskRunner.getLogStream(kinesisStreamName);
let iterator = await AWSTaskRunner.getLogIterator(stream); let iterator = await AWSTaskRunner.getLogIterator(stream);
const logBaseUrl = `https://${Input.region}.console.aws.amazon.com/cloudwatch/home?region=${Input.region}#logsV2:log-groups/log-group/${CloudRunner.buildParameters.awsBaseStackName}${AWSTaskRunner.encodedUnderscore}${CloudRunner.buildParameters.awsBaseStackName}-${CloudRunner.buildParameters.buildGuid}`; const logBaseUrl = `https://${Input.region}.console.aws.amazon.com/cloudwatch/home?region=${Input.region}#logsV2:log-groups/log-group/${CloudRunner.buildParameters.awsStackName}${AWSTaskRunner.encodedUnderscore}${CloudRunner.buildParameters.awsStackName}-${CloudRunner.buildParameters.buildGuid}`;
CloudRunnerLogger.log(`You view the log stream on AWS Cloud Watch: ${logBaseUrl}`); CloudRunnerLogger.log(`You view the log stream on AWS Cloud Watch: ${logBaseUrl}`);
await GitHub.updateGitHubCheck(`You view the log stream on AWS Cloud Watch: ${logBaseUrl}`, ``); await GitHub.updateGitHubCheck(`You view the log stream on AWS Cloud Watch: ${logBaseUrl}`, ``);
let shouldReadLogs = true; let shouldReadLogs = true;

2
src/model/cloud-runner/providers/aws/services/task-service.ts
View File

@ -161,7 +161,7 @@ export class TaskService {
process.env.AWS_REGION = Input.region; process.env.AWS_REGION = Input.region;
const s3 = new AWS.S3(); const s3 = new AWS.S3();
const listRequest: ListObjectsRequest = { const listRequest: ListObjectsRequest = {
Bucket: CloudRunner.buildParameters.awsBaseStackName, Bucket: CloudRunner.buildParameters.awsStackName,
}; };
const results = await s3.listObjects(listRequest).promise(); const results = await s3.listObjects(listRequest).promise();

22
src/model/cloud-runner/services/cloud-runner-custom-steps.ts
View File

@ -47,9 +47,7 @@ export class CloudRunnerCustomSteps {
aws configure set region $AWS_DEFAULT_REGION --profile default aws configure set region $AWS_DEFAULT_REGION --profile default
aws s3 cp /data/cache/$CI_CACHE_KEY/build/build-${CloudRunner.buildParameters.buildGuid}.tar${ aws s3 cp /data/cache/$CI_CACHE_KEY/build/build-${CloudRunner.buildParameters.buildGuid}.tar${
CloudRunner.buildParameters.compressionStrategy ? '.lz4' : '' CloudRunner.buildParameters.compressionStrategy ? '.lz4' : ''
} s3://${ } s3://${CloudRunner.buildParameters.awsStackName}/cloud-runner-cache/$CI_CACHE_KEY/build/build-$BUILD_GUID.tar${
CloudRunner.buildParameters.awsBaseStackName
}/cloud-runner-cache/$CI_CACHE_KEY/build/build-$BUILD_GUID.tar${
CloudRunner.buildParameters.compressionStrategy ? '.lz4' : '' CloudRunner.buildParameters.compressionStrategy ? '.lz4' : ''
} }
rm /data/cache/$CI_CACHE_KEY/build/build-${CloudRunner.buildParameters.buildGuid}.tar${ rm /data/cache/$CI_CACHE_KEY/build/build-${CloudRunner.buildParameters.buildGuid}.tar${
@ -68,10 +66,10 @@ export class CloudRunnerCustomSteps {
aws configure set aws_access_key_id $CI_AWS_ACCESS_KEY_ID --profile default aws configure set aws_access_key_id $CI_AWS_ACCESS_KEY_ID --profile default
aws configure set aws_secret_access_key $CI_AWS_SECRET_ACCESS_KEY --profile default aws configure set aws_secret_access_key $CI_AWS_SECRET_ACCESS_KEY --profile default
aws configure set region $CI_AWS_DEFAULT_REGION --profile default aws configure set region $CI_AWS_DEFAULT_REGION --profile default
aws s3 ls ${CloudRunner.buildParameters.awsBaseStackName}/cloud-runner-cache/ || true aws s3 ls ${CloudRunner.buildParameters.awsStackName}/cloud-runner-cache/ || true
aws s3 ls ${CloudRunner.buildParameters.awsBaseStackName}/cloud-runner-cache/$CI_CACHE_KEY/build || true aws s3 ls ${CloudRunner.buildParameters.awsStackName}/cloud-runner-cache/$CI_CACHE_KEY/build || true
aws s3 cp s3://${ aws s3 cp s3://${
CloudRunner.buildParameters.awsBaseStackName CloudRunner.buildParameters.awsStackName
}/cloud-runner-cache/$CI_CACHE_KEY/build/build-$BUILD_GUID_TARGET.tar${ }/cloud-runner-cache/$CI_CACHE_KEY/build/build-$BUILD_GUID_TARGET.tar${
CloudRunner.buildParameters.compressionStrategy ? '.lz4' : '' CloudRunner.buildParameters.compressionStrategy ? '.lz4' : ''
} /data/cache/$CI_CACHE_KEY/build/build-$BUILD_GUID_TARGET.tar${ } /data/cache/$CI_CACHE_KEY/build/build-$BUILD_GUID_TARGET.tar${
@ -126,11 +124,11 @@ export class CloudRunnerCustomSteps {
aws configure set aws_secret_access_key $CI_AWS_SECRET_ACCESS_KEY --profile default aws configure set aws_secret_access_key $CI_AWS_SECRET_ACCESS_KEY --profile default
aws configure set region $CI_AWS_DEFAULT_REGION --profile default aws configure set region $CI_AWS_DEFAULT_REGION --profile default
aws s3 cp --recursive /data/cache/$CI_CACHE_KEY/lfs s3://${ aws s3 cp --recursive /data/cache/$CI_CACHE_KEY/lfs s3://${
CloudRunner.buildParameters.awsBaseStackName CloudRunner.buildParameters.awsStackName
}/cloud-runner-cache/$CI_CACHE_KEY/lfs }/cloud-runner-cache/$CI_CACHE_KEY/lfs
rm -r /data/cache/$CI_CACHE_KEY/lfs rm -r /data/cache/$CI_CACHE_KEY/lfs
aws s3 cp --recursive /data/cache/$CI_CACHE_KEY/Library s3://${ aws s3 cp --recursive /data/cache/$CI_CACHE_KEY/Library s3://${
CloudRunner.buildParameters.awsBaseStackName CloudRunner.buildParameters.awsStackName
}/cloud-runner-cache/$CI_CACHE_KEY/Library }/cloud-runner-cache/$CI_CACHE_KEY/Library
rm -r /data/cache/$CI_CACHE_KEY/Library rm -r /data/cache/$CI_CACHE_KEY/Library
secrets: secrets:
@ -147,13 +145,13 @@ export class CloudRunnerCustomSteps {
aws configure set aws_access_key_id $CI_AWS_ACCESS_KEY_ID --profile default aws configure set aws_access_key_id $CI_AWS_ACCESS_KEY_ID --profile default
aws configure set aws_secret_access_key $CI_AWS_SECRET_ACCESS_KEY --profile default aws configure set aws_secret_access_key $CI_AWS_SECRET_ACCESS_KEY --profile default
aws configure set region $CI_AWS_DEFAULT_REGION --profile default aws configure set region $CI_AWS_DEFAULT_REGION --profile default
aws s3 ls ${CloudRunner.buildParameters.awsBaseStackName}/cloud-runner-cache/ || true aws s3 ls ${CloudRunner.buildParameters.awsStackName}/cloud-runner-cache/ || true
aws s3 ls ${CloudRunner.buildParameters.awsBaseStackName}/cloud-runner-cache/$CI_CACHE_KEY/ || true aws s3 ls ${CloudRunner.buildParameters.awsStackName}/cloud-runner-cache/$CI_CACHE_KEY/ || true
BUCKET1="${CloudRunner.buildParameters.awsBaseStackName}/cloud-runner-cache/$CI_CACHE_KEY/Library/" BUCKET1="${CloudRunner.buildParameters.awsStackName}/cloud-runner-cache/$CI_CACHE_KEY/Library/"
aws s3 ls $BUCKET1 || true aws s3 ls $BUCKET1 || true
OBJECT1="$(aws s3 ls $BUCKET1 | sort | tail -n 1 | awk '{print $4}' || '')" OBJECT1="$(aws s3 ls $BUCKET1 | sort | tail -n 1 | awk '{print $4}' || '')"
aws s3 cp s3://$BUCKET1$OBJECT1 /data/cache/$CI_CACHE_KEY/Library/ || true aws s3 cp s3://$BUCKET1$OBJECT1 /data/cache/$CI_CACHE_KEY/Library/ || true
BUCKET2="${CloudRunner.buildParameters.awsBaseStackName}/cloud-runner-cache/$CI_CACHE_KEY/lfs/" BUCKET2="${CloudRunner.buildParameters.awsStackName}/cloud-runner-cache/$CI_CACHE_KEY/lfs/"
aws s3 ls $BUCKET2 || true aws s3 ls $BUCKET2 || true
OBJECT2="$(aws s3 ls $BUCKET2 | sort | tail -n 1 | awk '{print $4}' || '')" OBJECT2="$(aws s3 ls $BUCKET2 | sort | tail -n 1 | awk '{print $4}' || '')"
aws s3 cp s3://$BUCKET2$OBJECT2 /data/cache/$CI_CACHE_KEY/lfs/ || true aws s3 cp s3://$BUCKET2$OBJECT2 /data/cache/$CI_CACHE_KEY/lfs/ || true

2
src/model/cloud-runner/services/shared-workspace-locking.ts
View File

@ -5,7 +5,7 @@ import BuildParameters from '../../build-parameters';
import CloudRunner from '../cloud-runner'; import CloudRunner from '../cloud-runner';
export class SharedWorkspaceLocking { export class SharedWorkspaceLocking {
public static get workspaceBucketRoot() { public static get workspaceBucketRoot() {
return `s3://${CloudRunner.buildParameters.awsBaseStackName}/`; return `s3://${CloudRunner.buildParameters.awsStackName}/`;
} }
public static get workspaceRoot() { public static get workspaceRoot() {
return `${SharedWorkspaceLocking.workspaceBucketRoot}locks/`; return `${SharedWorkspaceLocking.workspaceBucketRoot}locks/`;

2
src/model/cloud-runner/tests/cloud-runner-s3-steps.test.ts
View File

@ -39,7 +39,7 @@ describe('Cloud Runner pre-built S3 steps', () => {
expect(build2ContainsBuildSucceeded).toBeTruthy(); expect(build2ContainsBuildSucceeded).toBeTruthy();
const results = await CloudRunnerSystem.RunAndReadLines( const results = await CloudRunnerSystem.RunAndReadLines(
`aws s3 ls s3://${CloudRunner.buildParameters.awsBaseStackName}/cloud-runner-cache/`, `aws s3 ls s3://${CloudRunner.buildParameters.awsStackName}/cloud-runner-cache/`,
); );
CloudRunnerLogger.log(results.join(`,`)); CloudRunnerLogger.log(results.join(`,`));
}, 1_000_000_000); }, 1_000_000_000);