nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update travis for autotools

This commit is contained in:
Michael Stapelberg 2016-10-16 18:03:09 +02:00
parent 05e5901bca
commit ca98c7e614
7 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -32,7 +32,7 @@ install:
script: script:
- docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${BASENAME} ./travis/check-safe-wrappers.sh - docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${BASENAME} ./travis/check-safe-wrappers.sh
- docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${BASENAME} ./travis/check-formatting.sh - docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${BASENAME} ./travis/check-formatting.sh
- docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 -e CC -e CFLAGS="-Wformat -Wformat-security -Wextra -Wno-unused-parameter -Werror" ${BASENAME} make all mans -j ASAN=1 - docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 -e CC ${BASENAME} /bin/sh -c 'autoreconf -fi && mkdir -p build && cd build && (../configure || (cat config.log; false)) && make -j CFLAGS="-Wformat -Wformat-security -Wextra -Wno-unused-parameter -Werror"'
- docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${BASENAME} ./travis/check-spelling.pl - docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${BASENAME} ./travis/check-spelling.pl
- docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 -e CC ${BASENAME} ./travis/run-tests.sh - docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 -e CC ${BASENAME} ./travis/run-tests.sh
- ./travis/skip-pkg.sh || docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${BASENAME} ./travis/debian-build.sh deb/debian-amd64/DIST - ./travis/skip-pkg.sh || docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${BASENAME} ./travis/debian-build.sh deb/debian-amd64/DIST

3
Makefile.am
View File

@ -1,5 +1,8 @@
@CODE_COVERAGE_RULES@ @CODE_COVERAGE_RULES@
echo-version:
@echo "@I3_VERSION@"
bin_PROGRAMS = \ bin_PROGRAMS = \
i3 \ i3 \
i3bar/i3bar \ i3bar/i3bar \

1
configure.ac
View File

@ -35,6 +35,7 @@ AS_IF([test -d ${srcdir}/.git],
I3_VERSION="$(cat ${srcdir}/I3_VERSION)" I3_VERSION="$(cat ${srcdir}/I3_VERSION)"
is_release="$(grep -q non-git ${srcdir}/I3_VERSION && echo no || echo yes)" is_release="$(grep -q non-git ${srcdir}/I3_VERSION && echo no || echo yes)"
]) ])
AC_SUBST([I3_VERSION], [$I3_VERSION])
MAJOR_VERSION="$(echo ${VERSION} | cut -d '.' -f 1)" MAJOR_VERSION="$(echo ${VERSION} | cut -d '.' -f 1)"
MINOR_VERSION="$(echo ${VERSION} | cut -d '.' -f 2)" MINOR_VERSION="$(echo ${VERSION} | cut -d '.' -f 2)"
PATCH_VERSION="$(echo ${VERSION} | cut -d '.' -f 3)" PATCH_VERSION="$(echo ${VERSION} | cut -d '.' -f 3)"

16
travis/check-spelling.pl
View File

@ -29,13 +29,13 @@ my $binary_spelling_exceptions = {
'betwen' => 1, # asan_flags.inc contains this spelling error. 'betwen' => 1, # asan_flags.inc contains this spelling error.
}; };
my @binaries = qw( my @binaries = qw(
i3 build/i3
i3-config-wizard/i3-config-wizard build/i3-config-wizard/i3-config-wizard
i3-dump-log/i3-dump-log build/i3-dump-log/i3-dump-log
i3-input/i3-input build/i3-input/i3-input
i3-msg/i3-msg build/i3-msg/i3-msg
i3-nagbar/i3-nagbar build/i3-nagbar/i3-nagbar
i3bar/i3bar build/i3bar/i3bar
); );
for my $binary (@binaries) { for my $binary (@binaries) {
check_spelling(slurp($binary), $binary_spelling_exceptions, sub { check_spelling(slurp($binary), $binary_spelling_exceptions, sub {
@ -50,7 +50,7 @@ for my $binary (@binaries) {
my $manpage_spelling_exceptions = { my $manpage_spelling_exceptions = {
}; };
for my $name (glob('man/*.1')) { for my $name (glob('build/man/*.1')) {
for my $line (split(/\n/, slurp($name))) { for my $line (split(/\n/, slurp($name))) {
next if $line =~ /^\.\\\"/o; next if $line =~ /^\.\\\"/o;
check_spelling($line, $manpage_spelling_exceptions, sub { check_spelling($line, $manpage_spelling_exceptions, sub {

4
travis/clang-analyze.sh
View File

@ -3,7 +3,7 @@
set -e set -e
set -x set -x
mkdir -p deb/DIST-clang mkdir -p deb/DIST-clang/build
tar xf *.tar.bz2 -C deb/DIST-clang --strip-components=1 tar xf *.tar.bz2 -C deb/DIST-clang --strip-components=1
(cd deb/DIST-clang && scan-build -o ../CLANG --html-title="Analysis of i3 v$(git describe --tags)" make -j8) (cd deb/DIST-clang/build && scan-build -o ../../CLANG ../configure && scan-build -o ../../CLANG --html-title="Analysis of i3 v$(git describe --tags)" make -j8)
mv deb/CLANG/*/* deb/CLANG mv deb/CLANG/*/* deb/CLANG

9
travis/debian-build.sh
View File

@ -5,12 +5,15 @@ set -x
DEST=$1 DEST=$1
make store_git_version mkdir -p build
make dist cd build
../configure
make echo-version > ../I3_VERSION
make dist-bzip2
# unpack dist tarball # unpack dist tarball
mkdir -p "${DEST}" mkdir -p "${DEST}"
tar xf *.tar.bz2 -C "${DEST}" --strip-components=1 tar xf *.tar.bz2 -C "${DEST}" --strip-components=1
cp -r debian "${DEST}" cp -r ../debian "${DEST}"
sed -i '/^\s*libxcb-xrm-dev/d' deb/ubuntu-*/DIST/debian/control || true sed -i '/^\s*libxcb-xrm-dev/d' deb/ubuntu-*/DIST/debian/control || true
cd "${DEST}" cd "${DEST}"
debchange -m -l+g$(git describe --tags) 'Automatically built' debchange -m -l+g$(git describe --tags) 'Automatically built'

6
travis/run-tests.sh
View File

@ -3,7 +3,7 @@
set -e set -e
set -x set -x
cd testcases cd build
# TODO: remove this workaround once https://bugs.debian.org/836723 is fixed # TODO: remove this workaround once https://bugs.debian.org/836723 is fixed
# Found at https://llvm.org/bugs/show_bug.cgi?id=27310#c8: # Found at https://llvm.org/bugs/show_bug.cgi?id=27310#c8:
@ -26,7 +26,7 @@ fi
# Try running the tests in parallel so that the common case (tests pass) is # Try running the tests in parallel so that the common case (tests pass) is
# quick, but fall back to running them in sequence to make debugging easier. # quick, but fall back to running them in sequence to make debugging easier.
if ! xvfb-run ./complete-run.pl if ! xvfb-run make check
then then
xvfb-run ./complete-run.pl --parallel=1 || (cat latest/complete-run.log; false) xvfb-run ./testcases/complete-run.pl --parallel=1 || (cat latest/complete-run.log; false)
fi fi