Skip to content

Commit af23020

Browse files
committed
Regularise the AWS CodeBuild Clang buildspecs
Check out the diff vs. buildspec.yml and you'll see these are now much more regular. This duplication and drift is a vindication of Travis' "matrix" approach if you ask me ;)
1 parent d8598f8 commit af23020

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

buildspec-linux-clang-3.8.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ env:
77

88
phases:
99
install:
10+
runtime-versions:
11+
java: openjdk8
1012
commands:
1113
- sed -i 's#/archive.ubuntu.com#/us-east-1.ec2.archive.ubuntu.com#g' /etc/apt/sources.list
1214
- apt-get update -y
13-
- apt-get install -y clang-3.8 flex bison make git libwww-perl patch ccache libc6-dev-i386 jq openjdk-8-jdk maven
15+
- apt-get install -y clang-3.8 flex bison make git libwww-perl patch ccache libc6-dev-i386 jq maven
1416
build:
1517
commands:
1618
- echo Build started on `date`
17-
- git submodule update --init --recursive
1819
- make -C src minisat2-download
1920
- make -C jbmc/src setup-submodules
2021
- make -C src CXX='ccache /usr/bin/clang++-3.8' CXX_FLAGS='-Qunused-arguments -DDEBUG'

buildspec-linux-clang.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,19 @@ phases:
1616
build:
1717
commands:
1818
- echo Build started on `date`
19-
- git submodule update --init --recursive
20-
- make -C src CXX='ccache /usr/bin/clang++-7' CXX_FLAGS='-Qunused-arguments'
21-
- make -C jbmc/src CXX='ccache /usr/bin/clang++-7' CXX_FLAGS='-Qunused-arguments'
19+
- make -C src minisat2-download
20+
- make -C jbmc/src setup-submodules
21+
- make -C src CXX='ccache /usr/bin/clang++-7' CXX_FLAGS='-Qunused-arguments' -j2
22+
- make -C unit CXX='ccache /usr/bin/clang++-7' CXX_FLAGS='-Qunused-arguments' -j2
23+
- make -C jbmc/src CXX='ccache /usr/bin/clang++-7' CXX_FLAGS='-Qunused-arguments' -j2
24+
- make -C jbmc/unit CXX='ccache /usr/bin/clang++-7' CXX_FLAGS='-Qunused-arguments' -j2
2225
post_build:
2326
commands:
24-
- make -C unit test CXX='ccache /usr/bin/clang++-7' CXX_FLAGS='-Qunused-arguments'
27+
- make -C unit test
2528
- make -C regression test
29+
- make -C regression/cbmc test-paths-lifo
2630
- env PATH=$PATH:`pwd`/src/solvers make -C regression/cbmc test-cprover-smt2
27-
- make -C jbmc/unit test CXX='ccache /usr/bin/clang++-7' CXX_FLAGS='-Qunused-arguments'
31+
- make -C jbmc/unit test
2832
- make -C jbmc/regression test
2933
- echo Build completed on `date`
3034
cache:

0 commit comments

Comments
 (0)