aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNRK <nrk@disroot.org>2022-06-16 05:08:09 +0200
committerNRK <nrk@disroot.org>2022-06-16 05:08:09 +0200
commita67665a1c1569cdc16366cf635f76eb00c96048a (patch)
tree0628688f22ed1dd26fd58a8bb7d8b8fe754f4e9e
parent33a5d54cae441e447186c640747740dabc0c05fe (diff)
add codeberg ci and cleanup github one (#311)
- apt-get is slow, takes up ~1m40s just to install deps, fix it by not using it. instead use alpine linux for codeberg ci, which brings build time down to 25s. - And since alpine uses musl, it's probably a good idea to use it on our ci since it might catch us using any glibc extensions. The github ci can keep using ubuntu. - remove duplication of CFLAGS by having it on a separate file instead. - remove pull_request from github ci since we no longer accept PRs there. Closes: https://codeberg.org/nsxiv/nsxiv/issues/307 Reviewed-on: https://codeberg.org/nsxiv/nsxiv/pulls/311 Reviewed-by: Berke Kocaoğlu <berke.kocaoglu@metu.edu.tr> Reviewed-by: TAAPArthur <taaparthur@noreply.codeberg.org>
-rw-r--r--.github/workflows/build.yml58
-rw-r--r--.woodpecker/CFLAGS13
-rw-r--r--.woodpecker/build.yml28
3 files changed, 54 insertions, 45 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 69fcaea..c9269de 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,12 +3,10 @@ name: Build
on:
push:
branches: [ master ]
- pull_request:
- branches: [ master ]
# NOTE: "stable" tcc is too old and fails at linking. instead fetching a recent known working commit.
jobs:
- full-build:
+ build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
@@ -23,45 +21,15 @@ jobs:
( cd "tinycc-$TCC_SHA" && ./configure && make && sudo make install; )
- name: build
run: |
- # vanilla flags
- CFLAGS="-std=c99 -Wall -pedantic"
- # extra flags
- CFLAGS+=" -O3 -flto"
- CFLAGS+=" -Werror -Wextra -Wshadow -Wvla -Wpointer-arith"
- CFLAGS+=" -Wundef -Wstrict-overflow=4 -Wwrite-strings -Wunreachable-code"
- CFLAGS+=" -Wbad-function-cast -Wdeclaration-after-statement"
- CFLAGS+=" -Wmissing-prototypes -Wstrict-prototypes"
- # silence
- CFLAGS+=" -Wno-sign-compare -Wno-unused-parameter -Wno-missing-field-initializers"
- echo "### GCC BUILD ###" && make clean && make -s CC=gcc CFLAGS="$CFLAGS" LDFLAGS="$CFLAGS" OPT_DEP_DEFAULT=1
- echo "### CLANG BUILD ###" && make clean && make -s CC=clang CFLAGS="$CFLAGS" LDFLAGS="$CFLAGS" OPT_DEP_DEFAULT=1
- echo "### TCC BUILD ###" && make clean && make -s CC=tcc CFLAGS="$CFLAGS" LDFLAGS="$CFLAGS" OPT_DEP_DEFAULT=1
-
- minimal-build:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
- - name: dep
- run: |
- sudo apt-get update
- sudo apt-get install libimlib2 libimlib2-dev xserver-xorg-core xserver-xorg-dev \
- gcc clang git
- sudo apt-get remove libxft2 libxft-dev libexif12 libexif-dev
- 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; )
- - name: build
- run: |
- # vanilla flags
- CFLAGS="-std=c99 -Wall -pedantic"
- # extra flags
- CFLAGS+=" -O3 -flto"
- CFLAGS+=" -Werror -Wextra -Wshadow -Wvla -Wpointer-arith"
- CFLAGS+=" -Wundef -Wstrict-overflow=4 -Wwrite-strings -Wunreachable-code"
- CFLAGS+=" -Wbad-function-cast -Wdeclaration-after-statement"
- CFLAGS+=" -Wmissing-prototypes -Wstrict-prototypes"
- # silence
- CFLAGS+=" -Wno-sign-compare -Wno-unused-parameter -Wno-missing-field-initializers"
- echo "### GCC BUILD ###" && make clean && make -s CC=gcc CFLAGS="$CFLAGS" LDFLAGS="$CFLAGS" OPT_DEP_DEFAULT=0
- echo "### CLANG BUILD ###" && make clean && make -s CC=clang CFLAGS="$CFLAGS" LDFLAGS="$CFLAGS" OPT_DEP_DEFAULT=0
- echo "### TCC BUILD ###" && make clean && make -s CC=tcc CFLAGS="$CFLAGS" LDFLAGS="$CFLAGS" OPT_DEP_DEFAULT=0
+ CFLAGS="$(sed '/^#/d' .woodpecker/CFLAGS | paste -d ' ' -s)"
+ build () {
+ for cc in "gcc" "clang" "tcc"; do
+ echo "### $cc - $2 build ###"
+ make clean && make -s -j"$(nproc)" CC="$cc" CFLAGS="$CFLAGS" LDFLAGS="$CFLAGS" OPT_DEP_DEFAULT="$1"
+ done
+ }
+ # full-build #
+ build "1" "full"
+ # ensure minimal-build works without opt deps installed
+ sudo apt-get remove libxft2 libxft-dev libexif12 libexif-dev >/dev/null
+ build "0" "minimal"
diff --git a/.woodpecker/CFLAGS b/.woodpecker/CFLAGS
new file mode 100644
index 0000000..df24be7
--- /dev/null
+++ b/.woodpecker/CFLAGS
@@ -0,0 +1,13 @@
+# vanilla flags
+-std=c99 -Wall -pedantic
+# optimizations: enables extra warnings and deeper analysis thus catches more errors/warnings
+-O3 -flto
+# treat warnings as errors
+-Werror
+# extra flags
+-Wextra -Wshadow -Wvla -Wpointer-arith
+-Wundef -Wstrict-overflow=4 -Wwrite-strings -Wunreachable-code
+-Wbad-function-cast -Wdeclaration-after-statement
+-Wmissing-prototypes -Wstrict-prototypes
+# silence
+-Wno-sign-compare -Wno-unused-parameter -Wno-missing-field-initializers
diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml
new file mode 100644
index 0000000..d70e0e6
--- /dev/null
+++ b/.woodpecker/build.yml
@@ -0,0 +1,28 @@
+# NOTE: "stable" tcc is too old and fails at linking. instead fetching a recent known working commit.
+pipeline:
+ build:
+ image: alpine
+ environment:
+ - TCC_SHA=027b8fb9b88fe137447fb8bb1b61079be9702472
+ when:
+ branch: master
+ commands: |
+ apk add --no-cache \
+ imlib2 imlib2-dev xorgproto \
+ libxft libxft-dev libexif libexif-dev giflib giflib-dev libwebp libwebp-dev \
+ gcc clang llvm12 llvm12-dev build-base wget ca-certificates >/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' .woodpecker/CFLAGS | paste -d ' ' -s)"
+ build () {
+ for cc in "gcc" "clang" "tcc"; do
+ echo "### $cc - $2 build ###"
+ make clean && make -s -j"$(nproc)" CC="$cc" CFLAGS="$CFLAGS" LDFLAGS="$CFLAGS" OPT_DEP_DEFAULT="$1"
+ done
+ }
+ # full-build #
+ 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
+ build "0" "minimal"