Skip to content

Commit 995ec8a

Browse files
committed
Merge branch 'sg/travis-gcc-4.8'
Add a job to build with a tad older GCC to make sure we are still buildable. * sg/travis-gcc-4.8: travis-ci: build with GCC 4.8 as well
2 parents 7b70d46 + fb9d743 commit 995ec8a

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ matrix:
2121
compiler:
2222
addons:
2323
before_install:
24+
- env: jobname=linux-gcc-4.8
25+
os: linux
26+
dist: trusty
27+
compiler:
2428
- env: jobname=Linux32
2529
os: linux
2630
compiler:

ci/run-build-and-tests.sh

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,26 @@ windows*) cmd //c mklink //j t\\.prove "$(cygpath -aw "$cache_dir/.prove")";;
1111
esac
1212

1313
make
14-
make test
15-
if test "$jobname" = "linux-gcc"
16-
then
14+
case "$jobname" in
15+
linux-gcc)
16+
make test
1717
export GIT_TEST_SPLIT_INDEX=yes
1818
export GIT_TEST_FULL_IN_PACK_ARRAY=true
1919
export GIT_TEST_OE_SIZE=10
2020
export GIT_TEST_OE_DELTA_SIZE=5
2121
export GIT_TEST_COMMIT_GRAPH=1
2222
export GIT_TEST_MULTI_PACK_INDEX=1
2323
make test
24-
fi
24+
;;
25+
linux-gcc-4.8)
26+
# Don't run the tests; we only care about whether Git can be
27+
# built with GCC 4.8, as it errors out on some undesired (C99)
28+
# constructs that newer compilers seem to quietly accept.
29+
;;
30+
*)
31+
make test
32+
;;
33+
esac
2534

2635
check_unignored_build_artifacts
2736

0 commit comments

Comments
 (0)