cleanup

action/task-def-formation.yml

@@ -57,6 +57,15 @@ Parameters:
   UnityLicense:
     Type: String
     Default: '0'
+  UnityEmail:
+    Type: String
+    Default: '0'
+  UnityPassword:
+    Type: String
+    Default: '0'
+  UnitySerial:
+    Type: String
+    Default: '0'
   AndroidKeystoreBase64:
     Type: String
     Default: '0'
@@ -129,7 +138,25 @@ Resources:
     Type: AWS::SecretsManager::Secret
     Properties: 
       Name: !Join [ "", [ 'UnityLicense', !Ref BUILDID ] ]
-      SecretString: !Ref UnityLicense
+      SecretString: !Ref UnityLicense  
+      
+  UnityEmailSecret:
+    Type: AWS::SecretsManager::Secret
+    Properties: 
+      Name: !Join [ "", [ 'UnityEmail', !Ref BUILDID ] ]
+      SecretString: !Ref UnityEmail
+      
+  UnityPasswordSecret:
+    Type: AWS::SecretsManager::Secret
+    Properties: 
+      Name: !Join [ "", [ 'UnityPassword', !Ref BUILDID ] ]
+      SecretString: !Ref UnityPassword
+      
+  UnitySerialSecret:
+    Type: AWS::SecretsManager::Secret
+    Properties: 
+      Name: !Join [ "", [ 'UnitySerial', !Ref BUILDID ] ]
+      SecretString: !Ref UnitySerial
   
   AndroidKeystoreBase64Secret:
     Type: AWS::SecretsManager::Secret
@@ -207,6 +234,12 @@ Resources:
               ValueFrom: !Ref GithubTokenSecret
             - Name: 'UNITY_LICENSE'
               ValueFrom: !Ref UnityLicenseSecret
+            - Name: 'UNITY_EMAIL'
+              ValueFrom: !Ref UnityEmailSecret
+            - Name: 'UNITY_PASSWORD'
+              ValueFrom: !Ref UnityPasswordSecret
+            - Name: 'UNITY_SERIAL'
+              ValueFrom: !Ref UnitySerialSecret
             - Name: 'ANDROID_KEYSTORE_BASE64'
               ValueFrom: !Ref AndroidKeystoreBase64Secret
             - Name: 'ANDROID_KEYSTORE_PASS'

src/model/aws.js

@@ -47,11 +47,6 @@ class AWS {
       baseImage.toString(),
       ['/bin/sh'],
       ['-c', `
-      if [ '$GITHUB_TOKEN' == '0' ]; then unset GITHUB_TOKEN; fi
-      if [ '$UNITY_LICENSE' == '0' ]; then unset UNITY_LICENSE; fi
-      if [ '$ANDROID_KEYSTORE_BASE64' == '0' ]; then unset ANDROID_KEYSTORE_BASE64; fi
-      if [ '$ANDROID_KEYSTORE_PASS' == '0' ]; then unset ANDROID_KEYSTORE_PASS; fi
-      if [ '$ANDROID_KEYALIAS_PASS' == '0' ]; then unset ANDROID_KEYALIAS_PASS; fi
       cp -r /data/${buildUid}/builder/action/default-build-script /UnityBuilderAction;
       cp -r /data/${buildUid}/builder/action/entrypoint.sh /entrypoint.sh;
       cp -r /data/${buildUid}/builder/action/steps /steps;
@@ -118,6 +113,18 @@ class AWS {
           ParameterKey: 'UnityLicense',
           ParameterValue: process.env.UNITY_LICENSE
         },
+        {
+          ParameterKey: 'UnityEmail',
+          ParameterValue: process.env.UNITY_EMAIL
+        },
+        {
+          ParameterKey: 'UnityPassword',
+          ParameterValue: process.env.UNITY_PASSWORD
+        },
+        {
+          ParameterKey: 'UnitySerial',
+          ParameterValue: process.env.UNITY_SERIAL
+        },
         {
           ParameterKey: 'AndroidKeystoreBase64',
           ParameterValue: buildParameters.androidKeystoreBase64?buildParameters.androidKeystoreBase64:'0'
@@ -249,6 +256,7 @@ class AWS {
         }
       ].concat(secrets),
     }).promise();
+
     try{
       await CF.waitFor('stackCreateComplete', { StackName: taskDefStackName }).promise();
     }catch(error){