running git lfs clone

pull/218/head
mdugdale 2021-02-14 20:24:27 +00:00
parent bcecc1fbec
commit d22b61f966
3 changed files with 25 additions and 17 deletions

File diff suppressed because one or more lines are too long

View File

@ -63,6 +63,9 @@ Parameters:
AndroidKeyAliasPass:
Type: String
Default: 'Secret'
BUILDID:
Type: String
Default: 'noid'
Mappings:
SubnetConfig:
VPC:
@ -113,31 +116,31 @@ Resources:
GithubTokenSecret:
Type: AWS::SecretsManager::Secret
Properties:
Name: !Join [ "", [ 'GithubToken', !Ref BUILD_ID ] ]
Name: !Join [ "", [ 'GithubToken', !Ref BUILDID ] ]
SecretString: !Ref GithubToken
UnityLicenseSecret:
Type: AWS::SecretsManager::Secret
Properties:
Name: !Join [ "", [ 'UnityLicense', !Ref BUILD_ID ] ]
Name: !Join [ "", [ 'UnityLicense', !Ref BUILDID ] ]
SecretString: !Ref UnityLicense
AndroidKeystoreBase64Secret:
Type: AWS::SecretsManager::Secret
Properties:
Name: !Join [ "", [ 'AndroidKeystoreBase64', !Ref BUILD_ID ] ]
Name: !Join [ "", [ 'AndroidKeystoreBase64', !Ref BUILDID ] ]
SecretString: !Ref AndroidKeystoreBase64
AndroidKeystorePassSecret:
Type: AWS::SecretsManager::Secret
Properties:
Name: !Join [ "", [ 'AndroidKeystorePass', !Ref BUILD_ID ] ]
Name: !Join [ "", [ 'AndroidKeystorePass', !Ref BUILDID ] ]
SecretString: !Ref AndroidKeystorePass
AndroidKeyAliasPassSecret:
Type: AWS::SecretsManager::Secret
Properties:
Name: !Join [ "", [ 'AndroidKeyAliasPass', !Ref BUILD_ID ] ]
Name: !Join [ "", [ 'AndroidKeyAliasPass', !Ref BUILDID ] ]
SecretString: !Ref AndroidKeyAliasPass
TaskDefinition:
@ -184,28 +187,28 @@ Resources:
ContainerPath: !Ref EFSMountDirectory
ReadOnly: false
Secrets:
- Name: !Join [ "", [ 'GITHUB_TOKEN_', !Ref BUILD_ID ] ]
- Name: !Join [ "", [ 'GITHUB_TOKEN_', !Ref BUILDID ] ]
ValueFrom: !Ref GithubTokenSecret
- Name: !Join [ "", [ 'UNITY_LICENSE_', !Ref BUILD_ID ] ]
- Name: !Join [ "", [ 'UNITY_LICENSE_', !Ref BUILDID ] ]
ValueFrom: !Ref UnityLicenseSecret
- Name: !Join [ "", [ 'ANDROID_KEYSTORE_BASE64_', !Ref BUILD_ID ] ]
- Name: !Join [ "", [ 'ANDROID_KEYSTORE_BASE64_', !Ref BUILDID ] ]
ValueFrom: !Ref AndroidKeystoreBase64Secret
- Name: !Join [ "", [ 'ANDROID_KEYSTORE_PASS_', !Ref BUILD_ID ] ]
- Name: !Join [ "", [ 'ANDROID_KEYSTORE_PASS_', !Ref BUILDID ] ]
ValueFrom: !Ref AndroidKeystorePassSecret
- Name: !Join [ "", [ 'ANDROID_KEYALIAS_PASS_', !Ref BUILD_ID ] ]
- Name: !Join [ "", [ 'ANDROID_KEYALIAS_PASS_', !Ref BUILDID ] ]
ValueFrom: !Ref AndroidKeyAliasPassSecret
LogConfiguration:
LogDriver: awslogs
SecretOptions:
- Name: !Join [ "", [ 'GITHUB_TOKEN_', !Ref BUILD_ID ] ]
- Name: !Join [ "", [ 'GITHUB_TOKEN_', !Ref BUILDID ] ]
ValueFrom: !Ref GithubTokenSecret
- Name: !Join [ "", [ 'UNITY_LICENSE_', !Ref BUILD_ID ] ]
- Name: !Join [ "", [ 'UNITY_LICENSE_', !Ref BUILDID ] ]
ValueFrom: !Ref UnityLicenseSecret
- Name: !Join [ "", [ 'ANDROID_KEYSTORE_BASE64_', !Ref BUILD_ID ] ]
- Name: !Join [ "", [ 'ANDROID_KEYSTORE_BASE64_', !Ref BUILDID ] ]
ValueFrom: !Ref AndroidKeystoreBase64Secret
- Name: !Join [ "", [ 'ANDROID_KEYSTORE_PASS_', !Ref BUILD_ID ] ]
- Name: !Join [ "", [ 'ANDROID_KEYSTORE_PASS_', !Ref BUILDID ] ]
ValueFrom: !Ref AndroidKeystorePassSecret
- Name: !Join [ "", [ 'ANDROID_KEYALIAS_PASS_', !Ref BUILD_ID ] ]
- Name: !Join [ "", [ 'ANDROID_KEYALIAS_PASS_', !Ref BUILDID ] ]
ValueFrom: !Ref AndroidKeyAliasPassSecret
Options:
awslogs-group: !Ref ServiceName

View File

@ -144,8 +144,9 @@ class AWS {
static async run(stackName, image, entrypoint, commands, mountdir, workingdir, environment, secrets) {
const ECS = new SDK.ECS();
const CF = new SDK.CloudFormation();
const jobId = nanoid();
const taskDefStackName = `${stackName}-taskDef-${image}-${nanoid()}`
const taskDefStackName = `${stackName}-taskDef-${image}-${jobId}`
.toString()
.replace(/[^\da-z]/gi, '');
core.info('Creating build job resources');
@ -177,6 +178,10 @@ class AWS {
{
ParameterKey: 'EFSMountDirectory',
ParameterValue: mountdir,
},
{
ParameterKey: 'BUILDID',
ParameterValue: jobId,
}
].concat(secrets),
}).promise();