Retire official FreeBSD builder and create freebsd1032-1 and freebsd1…

…032-2 bots run by dhuseby.
rust-lang-deprecated · Jul 14, 2015 · 7c75a73 · 7c75a73
1 parent ba03050
commit 7c75a73
Showing 1 changed file with 20 additions and 14 deletions.
diff --git a/master/master.cfg b/master/master.cfg
@@ -134,15 +134,15 @@ auto_platforms_prod = [
     "win-msvc-64-opt",
 
     # Tier 2 platforms, also modify nogate_builders
-    "bsd-64-opt",
     "bitrig-64-opt",
     "linux-musl-64-opt",
-    "freebsd9-64-koobs",
-    "freebsd10-64-koobs"
+    "freebsd10_32-1",
+    "freebsd10_64-1"
 ]
 
-try_platforms_prod = ["linux", "win-gnu-32", "win-gnu-64", "bsd", "mac"]
-snap_platforms_prod = ["linux", "win-gnu-32", "win-gnu-64", "bsd", "mac", "bitrig-64", "freebsd9-64-koobs", "freebsd10-64-koobs"]
+try_platforms_prod = ["linux", "win-gnu-32", "win-gnu-64", "mac"]
+snap_platforms_prod = ["linux", "win-gnu-32", "win-gnu-64", "mac", "bitrig-64",
+                       "freebsd10_32-1", "freebsd10_64-1"]
 dist_platforms_prod = ["linux", "win-gnu-32", "win-gnu-64", "win-msvc-64", "mac"]
 cargo_platforms_prod = ["linux-32", "linux-64", "mac-32", "mac-64", "win-gnu-32", 
                         "win-gnu-64", "win-msvc-64", "bitrig-64"]
@@ -162,13 +162,15 @@ auto_platforms_dev = [
     "win-gnu-64-nopt-t",
     "win-msvc-64-opt",
 
-    "bsd-64-opt",
     "bitrig-64-opt",
     "linux-musl-64-opt",
+    "freebsd10_32-1",
+    "freebsd10_64-1"
 ]
 
-try_platforms_dev = ["linux", "win-gnu-32", "win-gnu-64", "bsd"]
-snap_platforms_dev = ["linux", "win-gnu-32", "win-gnu-64", "bsd", "bitrig-64"]
+try_platforms_dev = ["linux", "win-gnu-32", "win-gnu-64"]
+snap_platforms_dev = ["linux", "win-gnu-32", "win-gnu-64", "bitrig-64",
+                      "freebsd10_32-1", "freebsd10_64-1"]
 dist_platforms_dev = ["linux", "win-gnu-32", "win-gnu-64", "win-msvc-64"]
 cargo_platforms_dev = ["linux-32", "linux-64", "win-gnu-32", "win-gnu-64", 
                        "bitrig-64", "win-msvc-64"]
@@ -190,12 +192,11 @@ else:
 
 # auto-platforms that won't cause other's to fail (these don't gate bors)
 nogate_builders = [
-    "auto-bsd-64-opt", 
     "auto-bitrig-64-opt", 
     "auto-linux-musl-64-opt",
     "auto-win-msvc-64-opt",
-    "auto-freebsd9-64-koobs",
-    "auto-freebsd10-64-koobs"
+    "auto-freebsd10_32-1",
+    "auto-freebsd10_64-1"
 ]
 dist_nogate_platforms = ["win-msvc-64"]
 
@@ -211,7 +212,9 @@ def all_platform_hosts(platform):
         return ["i686-unknown-linux-gnu", "x86_64-unknown-linux-gnu"]
     elif "linux" in platform:
         return ["i686-unknown-linux-gnu", "x86_64-unknown-linux-gnu"]
-    elif "bsd" in platform:
+    elif "freebsd10_32" in platform:
+        return ["i686-unknown-freebsd"]
+    elif "freebsd10_64" in platform:
         return ["x86_64-unknown-freebsd"]
     elif "win-gnu-32" in platform:
         return ["i686-pc-windows-gnu"]
@@ -261,8 +264,11 @@ def auto_platform_triple(p):
         else:
             return "x86_64-pc-windows-" + env
 
-    if "bsd" in p:
-	return "x86_64-unknown-freebsd"
+    if "freebsd10" in p:
+        if "-32" in p:
+            return "i686-unknown-freebsd"
+        else:
+            return "x86_64-unknown-freebsd"
 
     if "bitrig-64" in p:
         return "x86_64-unknown-bitrig"