Promote beta targets to stable

Author: brson

master/master.cfg

@@ -254,15 +254,14 @@ stable_cross_targets = [
   {'t': 'mips64-unknown-linux-gnuabi64', 'b': rustbuild_cross, 'host': True, 'pkg': True},
   {'t': 'mips64el-unknown-linux-gnuabi64', 'b': rustbuild_cross, 'host': True, 'pkg': True},
   {'t': 's390x-unknown-linux-gnu', 'b': rustbuild_cross, 'host': True, 'pkg': True},
-]
-# FIXME: WHEN YOU PROMOTE THESE ARM TARGETS ALSO CHANGE THE DIST BUILDER SETUP MARKED WITH "XXX"
-beta_cross_targets = stable_cross_targets + [
   {'t': 'arm-unknown-linux-musleabi', 'b': lincross_rustbuild},
   {'t': 'arm-unknown-linux-musleabihf', 'b': lincross_rustbuild},
   {'t': 'armv7-unknown-linux-musleabihf', 'b': lincross_rustbuild},
   {'t': 'asmjs-unknown-emscripten', 'b': lincross_rustbuild},
   {'t': 'wasm32-unknown-emscripten', 'b': lincross_rustbuild},
 ]
+beta_cross_targets = stable_cross_targets + [
+]
 nightly_cross_targets = beta_cross_targets + [
 ]
 
@@ -1671,12 +1670,8 @@ for p in dist_platforms:
         if "rustbuild" in p:
             rustbuild = True
 
-        # FIXME: WHEN ARM TARGETS ARE PROMOTED CHANGE THIS TO INCLUDE BETA / STABLE XXX
         if 'cross-rustbuild-linux' in p:
-            if channel == 'nightly' or channel == 'beta':
-                musl = "arm"
-            else:
-                musl = None
+            musl = "arm"
 
         if channel == 'stable':
             my_cross_targets = stable_cross_targets