From 8f83a1f3a4395260d5ae4fb8036d42b7415b5f4c Mon Sep 17 00:00:00 2001 From: Hanspeter Portner Date: Fri, 3 Nov 2023 08:50:23 +0100 Subject: [PATCH] ci: update to alpine 3.18, add sign step --- .builds/alpine-latest.yml | 14 +++++++-- example/example.c | 2 +- meson_options.txt | 2 +- src/base.c | 60 ++++++++++++++++++--------------------- 4 files changed, 42 insertions(+), 36 deletions(-) diff --git a/.builds/alpine-latest.yml b/.builds/alpine-latest.yml index 37b1711..64a1624 100644 --- a/.builds/alpine-latest.yml +++ b/.builds/alpine-latest.yml @@ -6,8 +6,8 @@ image: alpine/latest packages: - - clang15-analyzer - - llvm15 + - clang16-analyzer + - llvm16 - reuse - meson - git-subtree @@ -31,6 +31,7 @@ secrets: - 0545580c-42ac-4700-b322-4e9df924eb07 # runner-ssh - 5fe806cd-3af4-4588-9898-8115d9262144 # hut-config - d6d10b2a-542a-4b45-b1be-6ef30a8ab558 # git-config + - 3de1773e-3503-46f5-8ab4-5212026517f4 # pgp-key sources: - https://git.open-music-kontrollers.ch/~hp/ci @@ -83,6 +84,15 @@ tasks: ci-meson analyzer build ci-meson analyzer test + - sign: | + . ~/ci/activate + + if ! ci-istag; then + complete-build + fi + + ci-archivesign + - deploy: | . ~/ci/activate diff --git a/example/example.c b/example/example.c index e218bc0..4ee3782 100644 --- a/example/example.c +++ b/example/example.c @@ -56,7 +56,7 @@ typedef enum _bar_t { BAR_MAX } bar_t; -static int32_t bar = BAR_LINEEDIT; +static int32_t bar = BAR_PANE; static const char *bar_lbl [BAR_MAX] = { [BAR_MIX] = "Mix of many", [BAR_SPINNER] = "Spinner", diff --git a/meson_options.txt b/meson_options.txt index ecd705a..a81d29c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -55,4 +55,4 @@ option('use-fontconfig', value : 'disabled', yield : true) -option('version', type : 'string', value : '0.4.2') +option('version', type : 'string', value : '0.5.11') diff --git a/src/base.c b/src/base.c index 30ccc33..b64dd13 100644 --- a/src/base.c +++ b/src/base.c @@ -677,13 +677,9 @@ d2tk_base_is_active_hot(d2tk_base_t *base, d2tk_id_t id, } #define nocol 0x0 -#define light_grey 0x7f7f7fff -#define dark_grey 0x3f3f3fff -#define darker_grey 0x222222ff -#define black 0x000000ff -#define white 0xffffffff -#define light_orange 0xffcf00ff -#define dark_orange 0xcf9f00ff +#define col1 0x020202ff +#define col2 0x026cfdff +#define col3 0xfdfdfdff #define FONT_SANS_BOLD "FiraSans:bold" @@ -695,36 +691,36 @@ d2tk_base_get_default_style(void) .border_width = 1, .padding = 1, .rounding = 4, - .bg_color = darker_grey, + .bg_color = col1, .fill_color = { - [D2TK_TRIPLE_NONE] = dark_grey, - [D2TK_TRIPLE_HOT] = light_grey, - [D2TK_TRIPLE_ACTIVE] = dark_orange, - [D2TK_TRIPLE_ACTIVE_HOT] = light_orange, - [D2TK_TRIPLE_FOCUS] = dark_grey, - [D2TK_TRIPLE_HOT_FOCUS] = light_grey, - [D2TK_TRIPLE_ACTIVE_FOCUS] = dark_orange, - [D2TK_TRIPLE_ACTIVE_HOT_FOCUS] = light_orange, + [D2TK_TRIPLE_NONE] = col3, + [D2TK_TRIPLE_HOT] = col3, + [D2TK_TRIPLE_ACTIVE] = col2, + [D2TK_TRIPLE_ACTIVE_HOT] = col2, + [D2TK_TRIPLE_FOCUS] = col3, + [D2TK_TRIPLE_HOT_FOCUS] = col3, + [D2TK_TRIPLE_ACTIVE_FOCUS] = col2, + [D2TK_TRIPLE_ACTIVE_HOT_FOCUS] = col2, }, .stroke_color = { - [D2TK_TRIPLE_NONE] = black, - [D2TK_TRIPLE_HOT] = black, - [D2TK_TRIPLE_ACTIVE] = black, - [D2TK_TRIPLE_ACTIVE_HOT] = black, - [D2TK_TRIPLE_FOCUS] = white, - [D2TK_TRIPLE_HOT_FOCUS] = white, - [D2TK_TRIPLE_ACTIVE_FOCUS] = white, - [D2TK_TRIPLE_ACTIVE_HOT_FOCUS] = white, + [D2TK_TRIPLE_NONE] = col1, + [D2TK_TRIPLE_HOT] = col2, + [D2TK_TRIPLE_ACTIVE] = col1, + [D2TK_TRIPLE_ACTIVE_HOT] = col3, + [D2TK_TRIPLE_FOCUS] = col1, + [D2TK_TRIPLE_HOT_FOCUS] = col2, + [D2TK_TRIPLE_ACTIVE_FOCUS] = col1, + [D2TK_TRIPLE_ACTIVE_HOT_FOCUS] = col3, }, .text_stroke_color = { - [D2TK_TRIPLE_NONE] = white, - [D2TK_TRIPLE_HOT] = light_orange, - [D2TK_TRIPLE_ACTIVE] = white, - [D2TK_TRIPLE_ACTIVE_HOT] = dark_grey, - [D2TK_TRIPLE_FOCUS] = white, - [D2TK_TRIPLE_HOT_FOCUS] = light_orange, - [D2TK_TRIPLE_ACTIVE_FOCUS] = white, - [D2TK_TRIPLE_ACTIVE_HOT_FOCUS] = dark_grey + [D2TK_TRIPLE_NONE] = col1, + [D2TK_TRIPLE_HOT] = col2, + [D2TK_TRIPLE_ACTIVE] = col1, + [D2TK_TRIPLE_ACTIVE_HOT] = col3, + [D2TK_TRIPLE_FOCUS] = col1, + [D2TK_TRIPLE_HOT_FOCUS] = col2, + [D2TK_TRIPLE_ACTIVE_FOCUS] = col1, + [D2TK_TRIPLE_ACTIVE_HOT_FOCUS] = col3 }, .text_fill_color = { [D2TK_TRIPLE_NONE] = nocol, -- 2.38.5