Merge branch 'master' into dev

tgstation · Oct 14, 2023 · ec2929b · ec2929b
2 parents 4818692 + c0f6686
commit ec2929b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml
@@ -113,11 +113,11 @@ jobs:
             echo "EDGE version evaluated to $FULL_VERSION"
 
             # Also needs updating in ByondTest.cs
-            declare -A missing_linux_releases=([515.1612]="515.1611")
+            declare -A bad_linux_releases=([515.1612]="515.1611" [515.1617]="515.1616")
 
-            if [[ -n "${missing_linux_releases[$FULL_VERSION]}" ]] ; then
-                echo "$FULL_VERSION does not have a linux zip, falling back to ${missing_linux_releases[$FULL_VERSION]}"
-                FULL_VERSION=${missing_linux_releases[$FULL_VERSION]}
+            if [[ -n "${bad_linux_releases[$FULL_VERSION]}" ]] ; then
+                echo "$FULL_VERSION does not have a linux zip, falling back to ${bad_linux_releases[$FULL_VERSION]}"
+                FULL_VERSION=${bad_linux_releases[$FULL_VERSION]}
             fi
         fi
         if [[ ! -f $HOME/byond-zips-cache/linux/$FULL_VERSION.zip ]] ; then

diff --git a/tests/Tgstation.Server.Tests/Live/Instance/ByondTest.cs b/tests/Tgstation.Server.Tests/Live/Instance/ByondTest.cs
@@ -63,7 +63,7 @@ public static async Task<Version> GetEdgeVersion(IFileDownloader fileDownloader,
 
 			var targetVersion = splits.Last();
 
-			var missingVersionMap = new PlatformIdentifier().IsWindows
+			var badVersionMap = new PlatformIdentifier().IsWindows
 				? new Dictionary<string, string>()
 				{
 				}
@@ -73,7 +73,9 @@ public static async Task<Version> GetEdgeVersion(IFileDownloader fileDownloader,
 					{ "515.1612", "515.1611" }
 				};
 
-			if (missingVersionMap.TryGetValue(targetVersion, out var remappedVersion))
+			badVersionMap.Add("515.1617", "515.1616");
+
+			if (badVersionMap.TryGetValue(targetVersion, out var remappedVersion))
 				targetVersion = remappedVersion;
 
 			return edgeVersion = Version.Parse(targetVersion);