Skip to content

Commit 9d18475

Browse files
ldemaillyFacebook Github Bot
authored andcommitted
Trigger lego-mac build too
Summary: This should let me get rid of the 2 mac minis on my desk and find open source mac breakage on diffs instead of after the facts Reviewed By: perryjrandall Differential Revision: D4287428 fbshipit-source-id: d6c9d80b64bc834a2a69496f2ee4cd2866427d0f
1 parent 6fe8140 commit 9d18475

File tree

2 files changed

+57
-4
lines changed

2 files changed

+57
-4
lines changed

build/lego-job-spec.sh

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#! /bin/sh
2+
23
cat <<EOF
34
[{
4-
"alias": "wdt-opensource",
5+
"alias": "wdt-opensource-linux",
56
"command": "SandcastleUniversalCommand",
67
"vcsType": "fbcode-fbsource",
78
"user": "ldemailly",
@@ -11,19 +12,49 @@ cat <<EOF
1112
"os": "ubuntu_16.04"
1213
},
1314
"args": {
14-
"name": "wdt-opensource",
15+
"name": "wdt-opensource-linux",
1516
"oncall": "wdt",
1617
"timeout": 10800,
1718
"steps": [
1819
{
1920
"user": "facebook",
20-
"name": "Build Wdt",
21+
"name": "Build Wdt OpenSource Linux",
2122
"shell": "mkdir wdt_build; cd wdt_build; pwd; cmake ../wdt -DFOLLY_SOURCE_DIR=$BOX_DIR -DBUILD_TESTING=on && make -j",
2223
"required": true
2324
},
2425
{
2526
"user": "facebook",
26-
"name": "Run Wdt Tests",
27+
"name": "Run Wdt OpenSource Linux Tests",
28+
"shell": "cd wdt_build; CTEST_OUTPUT_ON_FAILURE=1 make test",
29+
"required": true
30+
}
31+
]
32+
}
33+
},
34+
{
35+
"alias": "wdt-opensource-mac",
36+
"command": "SandcastleUniversalCommand",
37+
"vcsType": "fbcode-fbsource",
38+
"user": "ldemailly",
39+
"capabilities": {
40+
"vcs": "fbcode-fbsource",
41+
"type": "lego-mac",
42+
},
43+
"args": {
44+
"name": "wdt-opensource-mac",
45+
"oncall": "wdt",
46+
"timeout": 10800,
47+
"steps": [
48+
"steps": [
49+
{
50+
"user": "facebook",
51+
"name": "Build Wdt OpenSource Mac",
52+
"shell": "wdt/build/lego-mac-build.sh",
53+
"required": true
54+
},
55+
{
56+
"user": "facebook",
57+
"name": "Run Wdt OpenSource Mac Tests",
2758
"shell": "cd wdt_build; CTEST_OUTPUT_ON_FAILURE=1 make test",
2859
"required": true
2960
}

build/lego-mac-build.sh

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#! /bin/bash
2+
3+
# Remove the double-conversion part when Task#10922468 is done
4+
5+
set -x
6+
pwd
7+
uname -a
8+
mkdir wdt_build
9+
cd wdt_build || exit 1
10+
cmake --version
11+
export https_proxy=fwdproxy:8080
12+
git clone https://github.com/floitsch/double-conversion.git
13+
mkdir double-conversion-build
14+
(cd double-conversion-build && \
15+
cmake -DBUILD_SHARED_LIBS=on \
16+
-DCMAKE_INSTALL_PREFIX="$HOME" \
17+
../double-conversion; \
18+
make -j 4 && make install)
19+
20+
cmake ../wdt -DFOLLY_SOURCE_DIR="$(cd ..;pwd)" -DBUILD_TESTING=on \
21+
-DDOUBLECONV_INCLUDE_DIR="$HOME/include" \
22+
-DDOUBLECONV_LIBRARY="$HOME/lib/libdouble-conversion.dylib" && make -j

0 commit comments

Comments
 (0)