Skip to content
This repository was archived by the owner on Nov 21, 2018. It is now read-only.

Add emscripten targets to new 'rustbuild-cross' slaves #130

Merged
merged 1 commit into from
Oct 4, 2016
Merged

Add emscripten targets to new 'rustbuild-cross' slaves #130

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions master/master.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ auto_platforms = [
"linux-64-debug-opt",
"linux-musl-64-opt",
"linux-cross-opt",
"linux-rustbuildcross-opt",
"linux-rustbuild-cross-opt",
#"linux-32cross-opt",
"linux-64-opt-rustbuild",

Expand Down Expand Up @@ -175,7 +175,7 @@ dist_platforms = ["linux", "mac", "arm-android", "musl-linux",
"cross-linux",
"cross32-linux",
"cross-host-linux",
"rustbuildcross-linux",
"cross-rustbuild-linux",
"mac-ios",
"win-gnu-32", "win-gnu-64",
"win-msvc-32", "win-msvc-64",
Expand Down Expand Up @@ -211,13 +211,13 @@ nogate_builders = [
"auto-freebsd10_64-1",
"auto-dragonflybsd-64-opt",
"auto-openbsd-64-opt",
"auto-linux-rustbuildcross-opt",
"auto-linux-rustbuild-cross-opt",
]
dist_nogate_platforms = [
#"mac-ios",
#"cross-host-linux",
#"cross-win",
"rustbuildcross-linux",
"cross-rustbuild-linux",
]

cargo_cross_targets = [
Expand All @@ -233,7 +233,7 @@ cargo_cross_targets = [
ios = {'auto': 'cross-ios-opt', 'dist': 'mac-ios'}
lincross = {'auto': 'linux-cross', 'dist': 'cross-linux'}
lincross32 = {'auto': 'linux-32cross', 'dist': 'cross32-linux'}
lincross_rustbuild = {'auto': 'linux-rustbuildcross', 'dist': 'rustbuildcross-linux'}
lincross_rustbuild = {'auto': 'linux-rustbuild-cross', 'dist': 'cross-rustbuild-linux'}
msvc32 = {'auto': 'msvc-32-cross', 'dist': 'win-msvc-32-cross'}

def xhost(name):
Expand Down Expand Up @@ -1314,7 +1314,7 @@ def distsnap_buildfactory(platform, channel_label):

# Upload artifacts from slave
slave_dist_dir = "dist"
if 'cross-host-linux' in platform:
if 'cross-host-linux' in platform or 'cross-rustbuild-linux' in platform:
slave_dist_dir = "build/dist"
f.addStep(DirectoryUpload(slavesrc=slave_dist_dir,
masterdest=local_dist_platform_dir,
Expand Down Expand Up @@ -1822,6 +1822,8 @@ for p in dist_platforms:
my_targets = targets[:]
my_hosts = hosts
rustbuild = None
if "rustbuild" in p:
rustbuild = True

if channel == 'stable':
my_cross_targets = stable_cross_targets
Expand Down