Merge version 2.1.0 changes to aws/main (#253)

* Update release script to download server sdk and package it alongside the tarball (#243) * Fix scripts to stop further execution when error occurs * Create common script for verifying working directory * Download and package server sdk with release script * Add some color to the release scripts * Add server sdk argument to readme commands * Use PowerShell standard commands instead of aliases in release script * Resolve root directory from release script path * Move release script artifacts to dedicated folders * Minor tweaks from PR comments * GLIFT-22897: fix anywhere fleet dropdown fleet name not show (#245) * Update readme on prereq to install dedicated server build support module (#246) * Update readme on prereq to install dedicated server build support module Co-authored-by: AWSJackson <[email protected]> --------- Co-authored-by: AWSJackson <[email protected]> * Remove spot fleet scenario (#247) * Minor Version Bump (#251) * GLIFT-23157: Patch Version Bump cr: https://code.amazon.com/reviews/CR-113158659 * Adds new changelog item * Changed to approved wording * Changes patch version bump to minor version bump --------- Co-authored-by: Levi Gerber <[email protected]> --------- Co-authored-by: AWSJackson <[email protected]> Co-authored-by: wenxiul <[email protected]> Co-authored-by: Levi Gerber <[email protected]>
aws · Feb 9, 2024 · f5241d6 · f5241d6
1 parent 5b51751
commit f5241d6
Show file tree

Hide file tree

Showing 67 changed files with 232 additions and 1,676 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,11 +2,9 @@
 .idea/
 *.dll
 *.unitypackage
-*.tgz
-*.tgz.meta
 *.iml
 *.iml.meta
-SampleGameBuildLog.txt
+build.meta
 /build/
 
 # Infra

diff --git a/.npmignore b/.npmignore
@@ -6,10 +6,5 @@ infra/
 Scripts~/
 Temp~/
 
-*.tgz
-*.tgz.meta
-
-artifact.zip
-artifact.zip.meta
 build.meta
 infra.meta
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 CHANGELOG
 
+# 2.1.0 (2/13/2023)
+
+- Updated the Server SDK to 5.1.2
+- Removed Spot Fleet deployment scenario. For a deployment with Spot fleets and multi-location fleets, use the FlexMatch fleet scenario instead.
+
 # 2.0.0 (11/16/2023)
 
 - Added support for Amazon GameLift Server SDK 5 and Amazon GameLift Anywhere.

diff --git a/Editor/CoreAPI/DeploymentScenarios.cs b/Editor/CoreAPI/DeploymentScenarios.cs
@@ -6,7 +6,6 @@ namespace AmazonGameLift.Editor
     public enum DeploymentScenarios
     {
         SingleRegion = 0,
-        SpotFleet = 1,
-        FlexMatch = 2
+        FlexMatch = 1
     }
 }
diff --git a/...tch/AmazonGameLiftPlugin.FlexMatch.asmdef → ...tch/AmazonGameLiftPlugin.FlexMatch.asmdef b/...tch/AmazonGameLiftPlugin.FlexMatch.asmdef → ...tch/AmazonGameLiftPlugin.FlexMatch.asmdef
diff --git a/...mazonGameLiftPlugin.FlexMatch.asmdef.meta → ...mazonGameLiftPlugin.FlexMatch.asmdef.meta b/...mazonGameLiftPlugin.FlexMatch.asmdef.meta → ...mazonGameLiftPlugin.FlexMatch.asmdef.meta
diff --git a/...Formation/scenario3_flexmatch/Deployer.cs → ...Formation/scenario2_flexmatch/Deployer.cs b/...Formation/scenario3_flexmatch/Deployer.cs → ...Formation/scenario2_flexmatch/Deployer.cs
@@ -21,7 +21,7 @@ public sealed class Deployer : DeployerBase
 
         public override string HelpUrl => "https://docs.aws.amazon.com/gamelift/latest/developerguide/unity-plug-in-scenario.html";
 
-        public override string ScenarioFolder => "scenario3_flexmatch";
+        public override string ScenarioFolder => "scenario2_flexmatch";
 
         public override bool HasGameServer => true;
 

diff --git a/...tion/scenario3_flexmatch/Deployer.cs.meta → ...tion/scenario2_flexmatch/Deployer.cs.meta b/...tion/scenario3_flexmatch/Deployer.cs.meta → ...tion/scenario2_flexmatch/Deployer.cs.meta
diff --git a/...on/scenario3_flexmatch/cloudformation.yml → ...on/scenario2_flexmatch/cloudformation.yml b/...on/scenario3_flexmatch/cloudformation.yml → ...on/scenario2_flexmatch/cloudformation.yml
diff --git a/...enario3_flexmatch/cloudformation.yml.meta → ...enario2_flexmatch/cloudformation.yml.meta b/...enario3_flexmatch/cloudformation.yml.meta → ...enario2_flexmatch/cloudformation.yml.meta
diff --git a/...Formation/scenario3_flexmatch/lambda.meta → ...Formation/scenario2_flexmatch/lambda.meta b/...Formation/scenario3_flexmatch/lambda.meta → ...Formation/scenario2_flexmatch/lambda.meta
diff --git a/...exmatch/lambda/flexmatch_status_poller.py → ...exmatch/lambda/flexmatch_status_poller.py b/...exmatch/lambda/flexmatch_status_poller.py → ...exmatch/lambda/flexmatch_status_poller.py
diff --git a/...ch/lambda/flexmatch_status_poller.py.meta → ...ch/lambda/flexmatch_status_poller.py.meta b/...ch/lambda/flexmatch_status_poller.py.meta → ...ch/lambda/flexmatch_status_poller.py.meta
diff --git a/...cenario3_flexmatch/lambda/game_request.py → ...cenario2_flexmatch/lambda/game_request.py b/...cenario3_flexmatch/lambda/game_request.py → ...cenario2_flexmatch/lambda/game_request.py
diff --git a/...io3_flexmatch/lambda/game_request.py.meta → ...io2_flexmatch/lambda/game_request.py.meta b/...io3_flexmatch/lambda/game_request.py.meta → ...io2_flexmatch/lambda/game_request.py.meta
diff --git a/...xmatch/lambda/matchmaker_event_handler.py → ...xmatch/lambda/matchmaker_event_handler.py b/...xmatch/lambda/matchmaker_event_handler.py → ...xmatch/lambda/matchmaker_event_handler.py
diff --git a/...h/lambda/matchmaker_event_handler.py.meta → ...h/lambda/matchmaker_event_handler.py.meta b/...h/lambda/matchmaker_event_handler.py.meta → ...h/lambda/matchmaker_event_handler.py.meta
diff --git a/...ario3_flexmatch/lambda/results_request.py → ...ario2_flexmatch/lambda/results_request.py b/...ario3_flexmatch/lambda/results_request.py → ...ario2_flexmatch/lambda/results_request.py
diff --git a/..._flexmatch/lambda/results_request.py.meta → ..._flexmatch/lambda/results_request.py.meta b/..._flexmatch/lambda/results_request.py.meta → ..._flexmatch/lambda/results_request.py.meta
diff --git a/...ation/scenario3_flexmatch/parameters.json → ...ation/scenario2_flexmatch/parameters.json b/...ation/scenario3_flexmatch/parameters.json → ...ation/scenario2_flexmatch/parameters.json
diff --git a/.../scenario3_flexmatch/parameters.json.meta → .../scenario2_flexmatch/parameters.json.meta b/.../scenario3_flexmatch/parameters.json.meta → .../scenario2_flexmatch/parameters.json.meta
diff --git a/...dFormation/scenario3_flexmatch/tests.meta → ...dFormation/scenario2_flexmatch/tests.meta b/...dFormation/scenario3_flexmatch/tests.meta → ...dFormation/scenario2_flexmatch/tests.meta
diff --git a/...rmation/scenario3_flexmatch/tests/test.py → ...rmation/scenario2_flexmatch/tests/test.py b/...rmation/scenario3_flexmatch/tests/test.py → ...rmation/scenario2_flexmatch/tests/test.py
diff --git a/...on/scenario3_flexmatch/tests/test.py.meta → ...on/scenario2_flexmatch/tests/test.py.meta b/...on/scenario3_flexmatch/tests/test.py.meta → ...on/scenario2_flexmatch/tests/test.py.meta
diff --git a/Editor/Resources/CloudFormation/scenario2_spot_fleets/AmazonGameLiftPlugin.SpotFleets.asmdef b/Editor/Resources/CloudFormation/scenario2_spot_fleets/AmazonGameLiftPlugin.SpotFleets.asmdef
diff --git a/...esources/CloudFormation/scenario2_spot_fleets/AmazonGameLiftPlugin.SpotFleets.asmdef.meta b/...esources/CloudFormation/scenario2_spot_fleets/AmazonGameLiftPlugin.SpotFleets.asmdef.meta
diff --git a/Editor/Resources/CloudFormation/scenario2_spot_fleets/Deployer.cs b/Editor/Resources/CloudFormation/scenario2_spot_fleets/Deployer.cs
diff --git a/Editor/Resources/CloudFormation/scenario2_spot_fleets/Deployer.cs.meta b/Editor/Resources/CloudFormation/scenario2_spot_fleets/Deployer.cs.meta