Commit ca98c7e614c35c64cf717eaa95ebe9dafa5b02c1 - i3-gaps

+1

-1

.travis.yml less more

31	31	script:
32	32	- docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${BASENAME} ./travis/check-safe-wrappers.sh
33	33	- docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${BASENAME} ./travis/check-formatting.sh
34		- 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
	34	- 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"'
35	35	- docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${BASENAME} ./travis/check-spelling.pl
36	36	- docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 -e CC ${BASENAME} ./travis/run-tests.sh
37	37	- ./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

-0

Makefile.am less more

+1

-0

configure.ac less more

34	34	I3_VERSION="$(cat ${srcdir}/I3_VERSION)"
35	35	is_release="$(grep -q non-git ${srcdir}/I3_VERSION && echo no \|\| echo yes)"
36	36	])
	37	AC_SUBST([I3_VERSION], [$I3_VERSION])
37	38	MAJOR_VERSION="$(echo ${VERSION} \| cut -d '.' -f 1)"
38	39	MINOR_VERSION="$(echo ${VERSION} \| cut -d '.' -f 2)"
39	40	PATCH_VERSION="$(echo ${VERSION} \| cut -d '.' -f 3)"

+8

-8

travis/check-spelling.pl less more

28	28	'betwen' => 1, # asan_flags.inc contains this spelling error.
29	29	};
30	30	my @binaries = qw(
31		i3
32		i3-config-wizard/i3-config-wizard
33		i3-dump-log/i3-dump-log
34		i3-input/i3-input
35		i3-msg/i3-msg
36		i3-nagbar/i3-nagbar
37		i3bar/i3bar
	31	build/i3
	32	build/i3-config-wizard/i3-config-wizard
	33	build/i3-dump-log/i3-dump-log
	34	build/i3-input/i3-input
	35	build/i3-msg/i3-msg
	36	build/i3-nagbar/i3-nagbar
	37	build/i3bar/i3bar
38	38	);
39	39	for my $binary (@binaries) {
40	40	check_spelling(slurp($binary), $binary_spelling_exceptions, sub {

49	49	my $manpage_spelling_exceptions = {
50	50	};
51	51
52		for my $name (glob('man/*.1')) {
	52	for my $name (glob('build/man/*.1')) {
53	53	for my $line (split(/\n/, slurp($name))) {
54	54	next if $line =~ /^\.\\\"/o;
55	55	check_spelling($line, $manpage_spelling_exceptions, sub {

+2

-2

travis/clang-analyze.sh less more

2	2	set -e
3	3	set -x
4	4
5		mkdir -p deb/DIST-clang
	5	mkdir -p deb/DIST-clang/build
6	6	tar xf *.tar.bz2 -C deb/DIST-clang --strip-components=1
7		(cd deb/DIST-clang && scan-build -o ../CLANG --html-title="Analysis of i3 v$(git describe --tags)" make -j8)
	7	(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)
8	8	mv deb/CLANG// deb/CLANG

+6

-3

travis/debian-build.sh less more

4	4
5	5	DEST=$1
6	6
7		make store_git_version
8		make dist
	7	mkdir -p build
	8	cd build
	9	../configure
	10	make echo-version > ../I3_VERSION
	11	make dist-bzip2
9	12	# unpack dist tarball
10	13	mkdir -p "${DEST}"
11	14	tar xf *.tar.bz2 -C "${DEST}" --strip-components=1
12		cp -r debian "${DEST}"
	15	cp -r ../debian "${DEST}"
13	16	sed -i '/^\slibxcb-xrm-dev/d' deb/ubuntu-/DIST/debian/control \|\| true
14	17	cd "${DEST}"
15	18	debchange -m -l+g$(git describe --tags) 'Automatically built'

+3

-3

travis/run-tests.sh less more

2	2	set -e
3	3	set -x
4	4
5		cd testcases
	5	cd build
6	6
7	7	# TODO: remove this workaround once https://bugs.debian.org/836723 is fixed
8	8	# Found at https://llvm.org/bugs/show_bug.cgi?id=27310#c8:

25	25
26	26	# Try running the tests in parallel so that the common case (tests pass) is
27	27	# quick, but fall back to running them in sequence to make debugging easier.
28		if ! xvfb-run ./complete-run.pl
	28	if ! xvfb-run make check
29	29	then
30		xvfb-run ./complete-run.pl --parallel=1 \|\| (cat latest/complete-run.log; false)
	30	xvfb-run ./testcases/complete-run.pl --parallel=1 \|\| (cat latest/complete-run.log; false)
31	31	fi