From 0bc934070c01474e1196ee1964f59cc1c74040b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Fri, 31 Mar 2023 13:02:41 +0200 Subject: [PATCH] ci (woodpecker): do a second release build, using clang instead of gcc --- .woodpecker.yml | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 284da761..06631f89 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -33,7 +33,7 @@ pipeline: image: alpine:latest commands: - apk update - - apk add musl-dev linux-headers meson ninja gcc scdoc ncurses + - apk add musl-dev linux-headers meson ninja gcc clang scdoc ncurses - apk add libxkbcommon-dev pixman-dev freetype-dev fontconfig-dev harfbuzz-dev utf8proc-dev - apk add wayland-dev wayland-protocols - apk add git @@ -50,7 +50,7 @@ pipeline: - ./footclient --version - cd ../.. - # Release + # Release (gcc) - mkdir -p bld/release-x64 - cd bld/release-x64 - meson --buildtype=release -Db_pgo=generate -Dgrapheme-clustering=enabled -Dfcft:grapheme-shaping=enabled -Dfcft:run-shaping=enabled -Dfcft:test-text-shaping=true ../.. @@ -60,6 +60,16 @@ pipeline: - ./footclient --version - cd ../.. + # Release (clang) + - mkdir -p bld/release-x64-clang + - cd bld/release-x64-clang + - CC=clang meson --buildtype=release -Dgrapheme-clustering=enabled -Dfcft:grapheme-shaping=enabled -Dfcft:run-shaping=enabled -Dfcft:test-text-shaping=true ../.. + - ninja -v -k0 + - ninja -v test + - ./foot --version + - ./footclient --version + - cd ../.. + # no grapheme clustering - apk del harfbuzz harfbuzz-dev utf8proc utf8proc-dev - mkdir -p bld/debug @@ -80,7 +90,7 @@ pipeline: image: i386/alpine:latest commands: - apk update - - apk add musl-dev linux-headers meson ninja gcc scdoc ncurses + - apk add musl-dev linux-headers meson ninja gcc clang scdoc ncurses - apk add libxkbcommon-dev pixman-dev freetype-dev fontconfig-dev harfbuzz-dev utf8proc-dev - apk add wayland-dev wayland-protocols - apk add git @@ -97,7 +107,7 @@ pipeline: - ./footclient --version - cd ../.. - # Release + # Release (gcc) - mkdir -p bld/release-x86 - cd bld/release-x86 - meson --buildtype=release -Db_pgo=generate -Dgrapheme-clustering=enabled -Dfcft:grapheme-shaping=enabled -Dfcft:run-shaping=enabled -Dfcft:test-text-shaping=true ../.. @@ -106,3 +116,13 @@ pipeline: - ./foot --version - ./footclient --version - cd ../.. + + # Release (clang) + - mkdir -p bld/release-x86-clang + - cd bld/release-x86-clang + - CC=clang meson --buildtype=release -Dgrapheme-clustering=enabled -Dfcft:grapheme-shaping=enabled -Dfcft:run-shaping=enabled -Dfcft:test-text-shaping=true ../.. + - ninja -v -k0 + - ninja -v test + - ./foot --version + - ./footclient --version + - cd ../..