Promote beta targets

Author: brson

master/master.cfg

@@ -274,8 +274,6 @@ stable_cross_targets = [
   {'t': 'x86_64-rumprun-netbsd', 'b': lincross},
   {'t': 'x86_64-unknown-freebsd', 'b': xhost('freebsd'), 'host': True, 'pkg': True},
   {'t': 'x86_64-unknown-netbsd', 'b': xhost('netbsd'), 'host': True, 'pkg': True},
-]
-beta_cross_targets = stable_cross_targets + [
   {'t': 'powerpc-unknown-linux-gnu', 'b': rustbuild_cross, 'host': True, 'pkg': True},
   {'t': 'powerpc64-unknown-linux-gnu', 'b': rustbuild_cross, 'host': True, 'pkg': True},
   {'t': 'powerpc64le-unknown-linux-gnu', 'b': rustbuild_cross, 'host': True, 'pkg': True},
@@ -286,13 +284,15 @@ beta_cross_targets = stable_cross_targets + [
   {'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"
-nightly_cross_targets = beta_cross_targets + [
+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},
 ]
+nightly_cross_targets = beta_cross_targets + [
+]
 
 ####### BUILDSLAVES
 
@@ -1854,7 +1854,7 @@ for p in dist_platforms:
 
         # FIXME: WHEN ARM TARGETS ARE PROMOTED CHANGE THIS TO INCLUDE BETA / STABLE XXX
         if 'cross-rustbuild-linux' in p:
-            if channel == 'nightly':
+            if channel == 'nightly' or channel == 'beta':
                 musl = "arm"
             else:
                 musl = None