merge and fix aws check for base stack

.dependencygraph/setting.json

@@ -0,0 +1,3 @@
+{
+  "entryFilePath": "dist\\index.js"
+}

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: game-ci
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.vscode/settings.json

@@ -1,3 +1,32 @@
 {
-  "god.tsconfig": "./tsconfig.json"
+  "god.tsconfig": "./tsconfig.json",
+  "yaml.customTags": [
+    "!And",
+    "!And sequence",
+    "!If",
+    "!If sequence",
+    "!Not",
+    "!Not sequence",
+    "!Equals",
+    "!Equals sequence",
+    "!Or",
+    "!Or sequence",
+    "!FindInMap",
+    "!FindInMap sequence",
+    "!Base64",
+    "!Join",
+    "!Join sequence",
+    "!Cidr",
+    "!Ref",
+    "!Sub",
+    "!Sub sequence",
+    "!GetAtt",
+    "!GetAZs",
+    "!ImportValue",
+    "!ImportValue sequence",
+    "!Select",
+    "!Select sequence",
+    "!Split",
+    "!Split sequence"
+  ]
 }

README.md

@@ -41,6 +41,14 @@ To help improve the documentation, please find the docs [repository](https://git
 
 To contribute to Unity Builder, kindly read the [contribution guide](./CONTRIBUTING.md).
 
+## Support us
+
+GameCI is free for everyone forever.
+
+You can support us at [OpenCollective](https://opencollective.com/game-ci).
+
 ## Licence
 
-[MIT](./LICENSE)
+This repository is [MIT](./LICENSE) licensed.
+
+This includes all contributions from the community.

dist/index.js

@@ -1039,7 +1039,8 @@ class AWSBuildEnvironment {
                 CFState = { Stacks: [] };
             }
             const stackExists = CFState.Stacks !== null && CFState.Stacks !== [];
-            if (stackExists) {
+            if (!stackExists) {
+                core.info('stack exists');
                 yield CF.createStack({
                     StackName: baseStackName,
                     TemplateBody: baseStack,
@@ -2651,7 +2652,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-const core = __importStar(__webpack_require__(42186));
 const fs = __importStar(__webpack_require__(35747));
 const path_1 = __importDefault(__webpack_require__(85622));
 class UnityVersioning {
@@ -2667,8 +2667,7 @@ class UnityVersioning {
     static read(projectPath) {
         const filePath = path_1.default.join(projectPath, 'ProjectSettings', 'ProjectVersion.txt');
         if (!fs.existsSync(filePath)) {
-            core.warning(`Could not find "${filePath}", keeping unityVersion as "auto"`);
+            throw new Error(`Project settings file not found at "${filePath}". Have you correctly set the projectPath?`);
-            return 'auto';
         }
         return UnityVersioning.parse(fs.readFileSync(filePath, 'utf8'));
     }
@@ -202498,7 +202497,7 @@ const testParameter = (name, filters) => {
 };
 
 const normalizeDataURL = (urlString, {stripHash}) => {
-	const parts = urlString.match(/^data:(.*?),(.*?)(?:#(.*))?$/);
+	const parts = urlString.match(/^data:([^,]*?),([^#]*?)(?:#(.*))?$/);
 
 	if (!parts) {
 		throw new Error(`Invalid URL: ${urlString}`);

src/model/remote-builder/aws-build-platform.ts

@@ -244,7 +244,8 @@ class AWSBuildEnvironment implements RemoteBuilderProviderInterface {
       CFState = { Stacks: [] };
     }
     const stackExists: Boolean = CFState.Stacks !== null && CFState.Stacks !== [];
-    if (stackExists) {
+    if (!stackExists) {
+      core.info('stack exists');
       await CF.createStack({
         StackName: baseStackName,
         TemplateBody: baseStack,

src/model/unity-versioning.test.ts

@@ -14,8 +14,8 @@ describe('Unity Versioning', () => {
   });
 
   describe('read', () => {
-    it('does not throw', () => {
+    it('throws for invalid path', () => {
-      expect(() => UnityVersioning.read('')).not.toThrow();
+      expect(() => UnityVersioning.read('')).toThrow(Error);
     });
 
     it('reads from test-project', () => {

src/model/unity-versioning.ts

@@ -1,4 +1,3 @@
-import * as core from '@actions/core';
 import * as fs from 'fs';
 import path from 'path';
 
@@ -17,8 +16,7 @@ export default class UnityVersioning {
   static read(projectPath) {
     const filePath = path.join(projectPath, 'ProjectSettings', 'ProjectVersion.txt');
     if (!fs.existsSync(filePath)) {
-      core.warning(`Could not find "${filePath}", keeping unityVersion as "auto"`);
+      throw new Error(`Project settings file not found at "${filePath}". Have you correctly set the projectPath?`);
-      return 'auto';
     }
     return UnityVersioning.parse(fs.readFileSync(filePath, 'utf8'));
   }

yarn.lock

@@ -4126,9 +4126,9 @@ normalize-path@^3.0.0:
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
 normalize-url@^4.1.0:
-  version "4.5.0"
+  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a"
-  integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==
+  integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
 
 npm-run-path@^2.0.0:
   version "2.0.2"
@@ -4406,9 +4406,9 @@ path-key@^3.0.0, path-key@^3.1.0:
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
 path-parse@^1.0.6:
-  version "1.0.6"
+  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
 path-type@^2.0.0:
   version "2.0.0"