Commit aa56aa2

nsxivaa56aa2

[ci]: try building all combination with tcc (#338)

this will hopefully catch issues like [337] in the future.

not using gcc and/or clang since we have 5 build options right now,
which means 2^5 = 32 different combination. using gcc/clang would take
too much resources and time; meanwhile tcc is lightning fast.

[337]: https://codeberg.org/nsxiv/nsxiv/pulls/337

Author: NRK
Date: 2022-10-07 15:37 +0200
Parent: 85fffbb
Commit: aa56aa23030e9f8680d5ef366f2bd72fd342c14f

+49 −7

3 files changed

Browse files Patch

−Context 3+

M .github/workflows/build.yml +6 −4
M etc/woodpecker/build.yml +5 −3
A etc/woodpecker/try-all-builds.sh +38 −0

M .github/workflows/build.yml View

M etc/woodpecker/build.yml View

A etc/woodpecker/try-all-builds.sh View

		@@ -15,20 +15,22 @@ jobs:
15	15		sudo apt-get update
16	16		sudo apt-get install libimlib2 libimlib2-dev xserver-xorg-core xserver-xorg-dev \
17	17		libxft2 libxft-dev libexif12 libexif-dev \
18		−	gcc clang git
	18	+	gcc clang git bc
19	19		TCC_SHA="027b8fb9b88fe137447fb8bb1b61079be9702472"
20	20		wget "https://github.com/TinyCC/tinycc/archive/${TCC_SHA}.tar.gz" && tar xzf "${TCC_SHA}.tar.gz"
21		−	( cd "tinycc-$TCC_SHA" && ./configure && make && sudo make install; )
	21	+	( cd "tinycc-$TCC_SHA" && ./configure && make -j"$(nproc)" && sudo make install; )
22	22		- name: build
23	23		run: \|
24	24		CFLAGS="$(sed '/^#/d' etc/woodpecker/CFLAGS \| paste -d ' ' -s)"
25	25		build () {
26		−	for cc in "gcc" "clang" "tcc"; do
	26	+	for cc in "gcc" "clang"; do
27	27		echo "### $cc - $2 build ###"
28	28		make clean && make -s -j"$(nproc)" CC="$cc" CFLAGS="$CFLAGS" LDFLAGS="$CFLAGS" OPT_DEP_DEFAULT="$1"
29	29		done
30	30		}
31		−	# full-build #
	31	+	# try all combination with tcc #
	32	+	etc/woodpecker/try-all-builds.sh
	33	+	# full-build with gcc and clang #
32	34		build "1" "full"
33	35		# ensure minimal-build works without opt deps installed
34	36		sudo apt-get remove libxft2 libxft-dev libexif12 libexif-dev >/dev/null

		@@ -10,18 +10,20 @@ pipeline:
10	10		apk add --no-cache \
11	11		imlib2 imlib2-dev xorgproto \
12	12		libxft libxft-dev libexif libexif-dev giflib giflib-dev libwebp libwebp-dev \
13		−	gcc clang llvm llvm-dev build-base wget ca-certificates >/dev/null
	13	+	gcc clang llvm llvm-dev build-base wget ca-certificates bc >/dev/null
14	14		wget "https://github.com/TinyCC/tinycc/archive/$TCC_SHA.tar.gz" >/dev/null
15	15		tar xzf "$TCC_SHA.tar.gz" >/dev/null
16	16		( cd "tinycc-$TCC_SHA" && ./configure --config-musl && make -s -j"$(nproc)" && make install; ) >/dev/null
17	17		CFLAGS="$(sed '/^#/d' etc/woodpecker/CFLAGS \| paste -d ' ' -s)"
18	18		build () {
19		−	for cc in "gcc" "clang" "tcc"; do
	19	+	for cc in "gcc" "clang"; do
20	20		echo "### $cc - $2 build ###"
21	21		make clean && make -s -j"$(nproc)" CC="$cc" CFLAGS="$CFLAGS" LDFLAGS="$CFLAGS" OPT_DEP_DEFAULT="$1"
22	22		done
23	23		}
24		−	# full-build #
	24	+	# try all combination with tcc #
	25	+	etc/woodpecker/try-all-builds.sh
	26	+	# full-build with gcc and clang #
25	27		build "1" "full"
26	28		# ensure minimal-build works without opt deps installed
27	29		apk del libxft libxft-dev libexif libexif-dev giflib giflib-dev libwebp libwebp-dev >/dev/null

	@@ -0,0 +1,38 @@
1	+	#!/bin/sh
2	+	#
3	+	# Shell script that checks for all possible build combination with TCC.
4	+	# Usage: call the script while in the nsxiv root directory
5	+
6	+	set -- $(grep -o '^HAVE_[[:alpha:]]* ' config.mk)
7	+	CFLAGS="$(sed '/^#/d' etc/woodpecker/CFLAGS \| paste -d ' ' -s)"
8	+	z=$(echo "2 ^ $#" \| bc)
9	+
10	+	print_opt_name() {
11	+	shift "$(( $1 + 1 ))"
12	+	printf "%s=" "$1"
13	+	}
14	+
15	+	print_opt_arg() {
16	+	bn=$(echo "$1 / (2 ^ $2)" \| bc)
17	+	printf "%d " $(( bn % 2 ))
18	+	}
19	+
20	+	n=0
21	+	while [ "$n" -lt "$z" ]; do
22	+	i=0
23	+	while [ "$i" -lt "$#" ]; do
24	+	print_opt_name "$i" "$@"
25	+	print_opt_arg "$n" "$i"
26	+	i=$((i + 1))
27	+	done \| tee "/dev/stderr" \| (
28	+	make clean
29	+	if ! xargs make -j"$(nproc)" CC=tcc CFLAGS="$CFLAGS" LDFLAGS="$CFLAGS"; then
30	+	echo "[FAILED]" >&2
31	+	exit 1
32	+	else
33	+	echo "[SUCCESS]" >&2
34	+	fi
35	+	)
36	+	[ "$?" -ne 0 ] && exit "$?"
37	+	n=$((n + 1))
38	+	done >/dev/null

nsxiv/aa56aa2

[ci]: try building all combination with tcc (#338)

nsxivaa56aa2