Skip to content
This repository was archived by the owner on Sep 27, 2019. It is now read-only.

Commit 3bc6d46

Browse files
mbutrovichpervazea
mbutrovich
authored and
pervazea
committed
LLVM 3.9 for macOS (#1482)
* Replace LLVM 3.7 with 3.9. * Export new LLVM_DIR. * Replace exported path again. * Remove old, commented out Jenkins targets. * Revert Linux changes. * One more.
1 parent 6898305 commit 3bc6d46

File tree

3 files changed

+6
-233
lines changed

3 files changed

+6
-233
lines changed

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ matrix:
1414
- PELOTON_BUILD_TYPE=Debug
1515
- SANITIZER=Address
1616
- COVERALLS=Off
17-
17+
- LLVM_DIR=/usr/local/Cellar/[email protected]/3.9.1_1
1818
# Linux builds for gcc 5
1919
- os: linux
2020
sudo: required
@@ -71,7 +71,7 @@ script:
7171
- mkdir build
7272
- cd build
7373
# run cmake. NOTE: the PATH is made explicit to avoid automatic selection of the preinstalled llvm version in the Travis trusty image
74-
- PATH=/usr/lib/llvm-3.7/bin:/usr/bin:$PATH cmake -DCOVERALLS=$COVERALLS -DCMAKE_PREFIX_PATH=`llvm-config-3.7 --prefix` -DCMAKE_BUILD_TYPE=$PELOTON_BUILD_TYPE -DUSE_SANITIZER=$SANITIZER ..
74+
- PATH=/usr/lib/llvm-3.7/bin:/usr/bin:$PATH cmake -DCOVERALLS=$COVERALLS -DCMAKE_BUILD_TYPE=$PELOTON_BUILD_TYPE -DUSE_SANITIZER=$SANITIZER ..
7575
# build
7676
- make -j4
7777
# run tests

‎Jenkinsfile

Lines changed: 3 additions & 230 deletions
Original file line numberDiff line numberDiff line change
@@ -100,244 +100,17 @@ pipeline {
100100
steps {
101101
sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
102102
sh 'python script/validators/source_validator.py'
103+
sh 'export LLVM_DIR=/usr/local/Cellar/[email protected]/3.9.1_1'
103104
sh 'mkdir build'
104-
sh 'cd build && cmake -DCMAKE_PREFIX_PATH=`llvm-config-3.7 --prefix` -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DCOVERALLS=False .. && make -j4'
105+
sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DCOVERALLS=False .. && make -j4'
105106
sh 'cd build && ASAN_OPTIONS=detect_container_overflow=0 make check -j4'
106107
sh 'cd build && make install'
107108
sh 'cd build && bash ../script/testing/psql/psql_test.sh'
108109
sh 'cd build && python ../script/validators/jdbc_validator.py'
109110
sh 'cd build && ASAN_OPTIONS=detect_container_overflow=0 python ../script/testing/junit/run_junit.py'
110111
}
111112
}
112-
113-
// stage('Debian Stretch/gcc-6.3.0/llvm-3.8.1 (Debug)') {
114-
// agent { docker { image 'debian:stretch' } }
115-
// steps {
116-
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
117-
// sh 'python script/validators/source_validator.py'
118-
// sh 'mkdir build'
119-
// sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DCOVERALLS=False .. && make -j4'
120-
// sh 'cd build && make check -j4'
121-
// sh 'cd build && make install'
122-
// sh 'cd build && bash ../script/testing/psql/psql_test.sh'
123-
// sh 'sudo apt-get -qq update && sudo apt-get -qq -y --no-install-recommends install wget default-jdk default-jre' // prerequisites for jdbc_validator
124-
// sh 'cd build && python ../script/validators/jdbc_validator.py'
125-
// sh 'cd build && python ../script/testing/junit/run_junit.py'
126-
// }
127-
// }
128-
129-
// stage('Debian Stretch/gcc-6.3.0/llvm-3.8.1 (Release)') {
130-
// agent { docker { image 'debian:stretch' } }
131-
// steps {
132-
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
133-
// sh 'python script/validators/source_validator.py'
134-
// sh 'mkdir build'
135-
// sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
136-
// sh 'cd build && make check -j4'
137-
// sh 'cd build && make install'
138-
// sh 'cd build && bash ../script/testing/psql/psql_test.sh'
139-
// sh 'sudo apt-get -qq update && sudo apt-get -qq -y --no-install-recommends install wget default-jdk default-jre' // prerequisites for jdbc_validator
140-
// sh 'cd build && python ../script/validators/jdbc_validator.py'
141-
// sh 'cd build && python ../script/testing/junit/run_junit.py'
142-
// }
143-
// }
144-
145-
// stage('Fedora 26/gcc-7.1.1/llvm-4.0.1 (Debug)') {
146-
// agent { docker { image 'fedora:26' } }
147-
// steps {
148-
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
149-
// sh 'python script/validators/source_validator.py'
150-
// sh 'mkdir build'
151-
// sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DCOVERALLS=False .. && make -j4'
152-
// sh 'cd build && make check -j4'
153-
// sh 'cd build && make install'
154-
// sh 'cd build && bash ../script/testing/psql/psql_test.sh'
155-
// sh 'sudo dnf -q install -y wget java-devel' // prerequisites for jdbc_validator
156-
// sh 'cd build && python ../script/validators/jdbc_validator.py'
157-
// sh 'cd build && python ../script/testing/junit/run_junit.py'
158-
// }
159-
// }
160-
161-
// stage('Fedora 26/gcc-7.1.1/llvm-4.0.1 (Release)') {
162-
// agent { docker { image 'fedora:26' } }
163-
// steps {
164-
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
165-
// sh 'python script/validators/source_validator.py'
166-
// sh 'mkdir build'
167-
// sh 'cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
168-
// sh 'cd build && make check -j4'
169-
// sh 'cd build && make install'
170-
// sh 'cd build && bash ../script/testing/psql/psql_test.sh'
171-
// sh 'sudo dnf -q install -y wget java-devel' // prerequisites for jdbc_validator
172-
// sh 'cd build && python ../script/validators/jdbc_validator.py'
173-
// sh 'cd build && python ../script/testing/junit/run_junit.py'
174-
// }
175-
// }
176-
177-
// stage('Fedora 27/gcc-7.2.1/llvm-4.0.1 (Debug)') {
178-
// agent { docker { image 'fedora:27' } }
179-
// steps {
180-
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
181-
// sh 'python ./script/validators/source_validator.py'
182-
// sh 'mkdir build'
183-
// sh 'cd build && PATH=/usr/lib64/llvm4.0/bin:$PATH cmake -DCMAKE_CXX_FLAGS="-isystem /usr/include/llvm4.0" -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address -DCOVERALLS=False .. && make -j4'
184-
// sh 'cd build && make check -j4'
185-
// sh 'cd build && make install'
186-
// sh 'cd build && bash ../script/testing/psql/psql_test.sh'
187-
// sh 'sudo dnf -q install -y wget java-devel' // prerequisites for jdbc_validator
188-
// sh 'cd build && python ../script/validators/jdbc_validator.py'
189-
// sh 'cd build && python ../script/testing/junit/run_junit.py'
190-
// }
191-
// }
192-
193-
// stage('Fedora 27/gcc-7.2.1/llvm-4.0.1 (Release)') {
194-
// agent { docker { image 'fedora:27' } }
195-
// steps {
196-
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
197-
// sh 'python ./script/validators/source_validator.py'
198-
// sh 'mkdir build'
199-
// sh 'cd build && PATH=/usr/lib64/llvm4.0/bin:$PATH cmake -DCMAKE_CXX_FLAGS="-isystem /usr/include/llvm4.0" -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
200-
// sh 'cd build && make check -j4'
201-
// sh 'cd build && make install'
202-
// sh 'cd build && bash ../script/testing/psql/psql_test.sh'
203-
// sh 'sudo dnf -q install -y wget java-devel' // prerequisites for jdbc_validator
204-
// sh 'cd build && python ../script/validators/jdbc_validator.py'
205-
// sh 'cd build && python ../script/testing/junit/run_junit.py'
206-
// }
207-
// }
208-
209-
// stage('CentOS 7/gcc-4.8.5/llvm-3.9.1 (Debug)') {
210-
// agent { docker { image 'centos:7' } }
211-
// steps {
212-
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
213-
// sh 'python script/validators/source_validator.py'
214-
// sh 'mkdir build'
215-
// sh 'cd build && cmake3 -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False .. && make -j4'
216-
// sh 'cd build && make check -j4'
217-
// sh 'cd build && make install'
218-
// sh 'cd build && bash ../script/testing/psql/psql_test.sh'
219-
// sh 'sudo yum -q install -y wget java-devel' // prerequisites for jdbc_validator
220-
// sh 'cd build && python ../script/validators/jdbc_validator.py'
221-
// sh 'cd build && python ../script/testing/junit/run_junit.py'
222-
// }
223-
// }
224-
225-
// stage('CentOS 7/gcc-4.8.5/llvm-3.9.1 (Release)') {
226-
// agent { docker { image 'centos:7' } }
227-
// steps {
228-
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
229-
// sh 'python script/validators/source_validator.py'
230-
// sh 'mkdir build'
231-
// sh 'cd build && cmake3 -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
232-
// sh 'cd build && make check -j4'
233-
// sh 'cd build && make install'
234-
// sh 'cd build && bash ../script/testing/psql/psql_test.sh'
235-
// sh 'sudo yum -q install -y wget java-devel' // prerequisites for jdbc_validator
236-
// sh 'cd build && python ../script/validators/jdbc_validator.py'
237-
// sh 'cd build && python ../script/testing/junit/run_junit.py'
238-
// }
239-
// }
240-
// end gcc builds
241-
242-
// begin clang builds
243-
// stage('Ubuntu Xenial/clang-3.7.1/llvm-3.7.1 (Debug)') {
244-
// agent { docker { image 'ubuntu:xenial' } }
245-
// steps {
246-
// sh 'sudo /bin/bash -c "source ./peloton/script/installation/packages.sh"'
247-
// sh 'python script/validators/source_validator.py'
248-
// sh 'mkdir build'
249-
// sh 'cd build && CC=clang-3.7 CXX=clang++-3.7 cmake -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False .. && make -j4 && make install'
250-
// }
251-
// }
252-
253-
// stage('Ubuntu Xenial/clang-3.7.1/llvm-3.7.1 (Release)') {
254-
// agent { docker { image 'ubuntu:xenial' } }
255-
// steps {
256-
// sh 'sudo /bin/bash -c "source ./peloton/script/installation/packages.sh"'
257-
// sh 'python script/validators/source_validator.py'
258-
// sh 'mkdir build'
259-
// sh 'cd build && CC=clang-3.7 CXX=clang++-3.7 cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4 && make install'
260-
// }
261-
// }
262-
263-
// stage('Ubuntu Trusty/clang-3.7.1/llvm-3.7.1 (Debug)') {
264-
// agent { docker { image 'ubuntu:trusty' } }
265-
// steps {
266-
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
267-
// sh 'python script/validators/source_validator.py'
268-
// sh 'mkdir build'
269-
// sh 'cd build && CC=clang-3.7 CXX=clang++-3.7 cmake -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False .. && make -j4'
270-
// }
271-
// }
272-
273-
// stage('Ubuntu Trusty/clang-3.7.1/llvm-3.7.1 (Release)') {
274-
// agent { docker { image 'ubuntu:trusty' } }
275-
// steps {
276-
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
277-
// sh 'python script/validators/source_validator.py'
278-
// sh 'mkdir build'
279-
// sh 'cd build && CC=clang-3.7 CXX=clang++-3.7 cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
280-
// }
281-
// }
282-
283-
// stage('Fedora 26/clang-4.0.1/llvm-4.0.1 (Debug)') {
284-
// agent { docker { image 'fedora:26' } }
285-
// steps {
286-
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
287-
// sh 'python script/validators/source_validator.py'
288-
// sh 'mkdir build'
289-
// sh 'cd build && CC=clang CXX=clang++ cmake -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False .. && make -j4'
290-
// }
291-
// }
292-
293-
// stage('Fedora 26/clang-4.0.1/llvm-4.0.1 (Release)') {
294-
// agent { docker { image 'fedora:26' } }
295-
// steps {
296-
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
297-
// sh 'python script/validators/source_validator.py'
298-
// sh 'mkdir build'
299-
// sh 'cd build && CC=clang CXX=clang++ cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
300-
// }
301-
// }
302-
303-
// stage('Fedora 27/clang-4.0.1/llvm-4.0.1 (Debug)') {
304-
// agent { docker { image 'fedora:27' } }
305-
// steps {
306-
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
307-
// sh 'python script/validators/source_validator.py'
308-
// sh 'mkdir build'
309-
// sh 'cd build && CC=clang CXX=clang++ cmake -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=False .. && make -j4'
310-
// }
311-
// }
312-
313-
// stage('Fedora 27/clang-4.0.1/llvm-4.0.1 (Release)') {
314-
// agent { docker { image 'fedora:27' } }
315-
// steps {
316-
// sh 'sudo /bin/bash -c "source ./script/installation/packages.sh"'
317-
// sh 'python script/validators/source_validator.py'
318-
// sh 'mkdir build'
319-
// sh 'cd build && CC=clang CXX=clang++ cmake -DCMAKE_BUILD_TYPE=Release -DCOVERALLS=False .. && make -j4'
320-
// }
321-
// }
322-
323-
// Omit this configuration for now since the corresponding version of clang does not seem to be available on this platform
324-
// stage('CentOS 7/clang-??/llvm-3.9.1') {
325-
// agent { docker { image 'centos:7' } }
326-
// steps {
327-
// sh 'lsb_release -a'
328-
// }
329-
// }
330-
// end clang builds
331113
}
332114
}
333115
}
334-
335-
// Process test results from the first build stage
336-
// post {
337-
// always {
338-
// dir("${WORKSPACE}/../builds/${BUILD_ID}") {
339-
// step([$class: 'XUnitBuilder', testTimeMargin: '3000', thresholdMode: 1, thresholds: [[$class: 'FailedThreshold', failureNewThreshold: '', failureThreshold: '', unstableNewThreshold: '', unstableThreshold: ''], [$class: 'SkippedThreshold', failureNewThreshold: '', failureThreshold: '', unstableNewThreshold: '', unstableThreshold: '']], tools: [[$class: 'GoogleTestType', deleteOutputFiles: true, failIfNotNew: true, pattern: 'test/*_test.xml', skipNoTestFiles: false, stopProcessingIfError: true]]])
340-
// }
341-
// }
342-
// }
343-
}
116+
}

‎script/installation/packages.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ elif [ "$DISTRO" = "DARWIN" ]; then
219219
brew install lcov
220220
brew install libpqxx
221221
brew install libedit
222-
brew install llvm@3.7
222+
brew install llvm@3.9
223223
brew install postgresql
224224
brew install libffi
225225
brew install tbb

0 commit comments

Comments
 (0)