aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNRK <nrk@disroot.org>2022-10-07 15:37:44 +0200
committerNRK <nrk@disroot.org>2022-10-07 15:37:44 +0200
commitaa56aa23030e9f8680d5ef366f2bd72fd342c14f (patch)
treec0abf72eeb08effe4806ad141d2f4f04fe6f0ecd
parent85fffbb277418dfc5e03fc8e01335553333d8049 (diff)
downloadnsxiv-aa56aa23030e9f8680d5ef366f2bd72fd342c14f.tar.zst
[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 Reviewed-on: https://codeberg.org/nsxiv/nsxiv/pulls/338 Reviewed-by: eylles <eylles@noreply.codeberg.org>
-rw-r--r--.github/workflows/build.yml10
-rw-r--r--etc/woodpecker/build.yml8
-rwxr-xr-xetc/woodpecker/try-all-builds.sh38
3 files changed, 49 insertions, 7 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 69d9270..50ddebf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,20 +15,22 @@ jobs:
sudo apt-get update
sudo apt-get install libimlib2 libimlib2-dev xserver-xorg-core xserver-xorg-dev \
libxft2 libxft-dev libexif12 libexif-dev \
- gcc clang git
+ gcc clang git bc
TCC_SHA="027b8fb9b88fe137447fb8bb1b61079be9702472"
wget "https://github.com/TinyCC/tinycc/archive/${TCC_SHA}.tar.gz" && tar xzf "${TCC_SHA}.tar.gz"
- ( cd "tinycc-$TCC_SHA" && ./configure && make && sudo make install; )
+ ( cd "tinycc-$TCC_SHA" && ./configure && make -j"$(nproc)" && sudo make install; )
- name: build
run: |
CFLAGS="$(sed '/^#/d' etc/woodpecker/CFLAGS | paste -d ' ' -s)"
build () {
- for cc in "gcc" "clang" "tcc"; do
+ for cc in "gcc" "clang"; do
echo "### $cc - $2 build ###"
make clean && make -s -j"$(nproc)" CC="$cc" CFLAGS="$CFLAGS" LDFLAGS="$CFLAGS" OPT_DEP_DEFAULT="$1"
done
}
- # full-build #
+ # try all combination with tcc #
+ etc/woodpecker/try-all-builds.sh
+ # full-build with gcc and clang #
build "1" "full"
# ensure minimal-build works without opt deps installed
sudo apt-get remove libxft2 libxft-dev libexif12 libexif-dev >/dev/null
diff --git a/etc/woodpecker/build.yml b/etc/woodpecker/build.yml
index 603fa0e..eced0d1 100644
--- a/etc/woodpecker/build.yml
+++ b/etc/woodpecker/build.yml
@@ -10,18 +10,20 @@ pipeline:
apk add --no-cache \
imlib2 imlib2-dev xorgproto \
libxft libxft-dev libexif libexif-dev giflib giflib-dev libwebp libwebp-dev \
- gcc clang llvm llvm-dev build-base wget ca-certificates >/dev/null
+ gcc clang llvm llvm-dev build-base wget ca-certificates bc >/dev/null
wget "https://github.com/TinyCC/tinycc/archive/$TCC_SHA.tar.gz" >/dev/null
tar xzf "$TCC_SHA.tar.gz" >/dev/null
( cd "tinycc-$TCC_SHA" && ./configure --config-musl && make -s -j"$(nproc)" && make install; ) >/dev/null
CFLAGS="$(sed '/^#/d' etc/woodpecker/CFLAGS | paste -d ' ' -s)"
build () {
- for cc in "gcc" "clang" "tcc"; do
+ for cc in "gcc" "clang"; do
echo "### $cc - $2 build ###"
make clean && make -s -j"$(nproc)" CC="$cc" CFLAGS="$CFLAGS" LDFLAGS="$CFLAGS" OPT_DEP_DEFAULT="$1"
done
}
- # full-build #
+ # try all combination with tcc #
+ etc/woodpecker/try-all-builds.sh
+ # full-build with gcc and clang #
build "1" "full"
# ensure minimal-build works without opt deps installed
apk del libxft libxft-dev libexif libexif-dev giflib giflib-dev libwebp libwebp-dev >/dev/null
diff --git a/etc/woodpecker/try-all-builds.sh b/etc/woodpecker/try-all-builds.sh
new file mode 100755
index 0000000..89e41f1
--- /dev/null
+++ b/etc/woodpecker/try-all-builds.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+#
+# Shell script that checks for all possible build combination with TCC.
+# Usage: call the script while in the nsxiv root directory
+
+set -- $(grep -o '^HAVE_[[:alpha:]]* ' config.mk)
+CFLAGS="$(sed '/^#/d' etc/woodpecker/CFLAGS | paste -d ' ' -s)"
+z=$(echo "2 ^ $#" | bc)
+
+print_opt_name() {
+ shift "$(( $1 + 1 ))"
+ printf "%s=" "$1"
+}
+
+print_opt_arg() {
+ bn=$(echo "$1 / (2 ^ $2)" | bc)
+ printf "%d " $(( bn % 2 ))
+}
+
+n=0
+while [ "$n" -lt "$z" ]; do
+ i=0
+ while [ "$i" -lt "$#" ]; do
+ print_opt_name "$i" "$@"
+ print_opt_arg "$n" "$i"
+ i=$((i + 1))
+ done | tee "/dev/stderr" | (
+ make clean
+ if ! xargs make -j"$(nproc)" CC=tcc CFLAGS="$CFLAGS" LDFLAGS="$CFLAGS"; then
+ echo "[FAILED]" >&2
+ exit 1
+ else
+ echo "[SUCCESS]" >&2
+ fi
+ )
+ [ "$?" -ne 0 ] && exit "$?"
+ n=$((n + 1))
+done >/dev/null