Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Alpine Linux to 3.21 in Github workflows #140

Merged
merged 2 commits into from
Feb 15, 2025
Merged

Update Alpine Linux to 3.21 in Github workflows #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b615eb
Update Alpine Linux to 3.21 in Github workflows
francma Feb 15, 2025
e15db7c
Clang format
francma Feb 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
test:
runs-on: ubuntu-latest
container: alpine:3.18
container: alpine:3.21
steps:
- uses: actions/checkout@v2
- name: Install dependencies
Expand All @@ -19,11 +19,11 @@ jobs:

analyze:
runs-on: ubuntu-latest
container: alpine:3.18
container: alpine:3.21
steps:
- uses: actions/checkout@v2
- name: Install dependencies
run: apk update && apk add meson wayland-dev musl-dev wayland-protocols gcc inih-dev cmocka-dev clang16 clang16-extra-tools clang16-analyzer
run: apk update && apk add meson wayland-dev musl-dev wayland-protocols gcc inih-dev cmocka-dev clang19 clang19-extra-tools clang19-analyzer
- name: Run clang-analyzer
if: success() || failure()
run: scan-build meson setup clang-analyzer && scan-build --status-bugs ninja -C clang-analyzer
Expand All @@ -33,10 +33,10 @@ jobs:

format:
runs-on: ubuntu-latest
container: alpine:3.18
container: alpine:3.21
steps:
- uses: actions/checkout@v2
- name: Install dependencies
run: apk update && apk add clang16-extra-tools
run: apk update && apk add clang19-extra-tools
- name: Run clang-format
run: clang-format -Werror --dry-run src/* test/*
2 changes: 1 addition & 1 deletion src/color.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ wob_color_from_rgba_string(const char *str, struct wob_color *color)
return false;
}

*color = (struct wob_color){
*color = (struct wob_color) {
.r = (float) parts[0] / UINT8_MAX,
.g = (float) parts[1] / UINT8_MAX,
.b = (float) parts[2] / UINT8_MAX,
Expand Down
2 changes: 1 addition & 1 deletion src/color.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <stdint.h>

#define WOB_COLOR_PRINTF_FORMAT "%02X%02X%02X%02X"
#define WOB_COLOR_PRINTF_RGBA(x) (uint8_t)(x.r * UINT8_MAX), (uint8_t) (x.g * UINT8_MAX), (uint8_t) (x.b * UINT8_MAX), (uint8_t) (x.a * UINT8_MAX)
#define WOB_COLOR_PRINTF_RGBA(x) (uint8_t) (x.r * UINT8_MAX), (uint8_t) (x.g * UINT8_MAX), (uint8_t) (x.b * UINT8_MAX), (uint8_t) (x.a * UINT8_MAX)

struct wob_color {
float a;
Expand Down
14 changes: 7 additions & 7 deletions src/config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,16 +511,16 @@ wob_config_create()
config->dimensions.border_size = 4;
config->dimensions.bar_padding = 4;
config->dimensions.orientation = WOB_ORIENTATION_HORIZONTAL;
config->margin = (struct wob_margin){.top = 0, .left = 0, .bottom = 0, .right = 0};
config->margin = (struct wob_margin) {.top = 0, .left = 0, .bottom = 0, .right = 0};
config->anchor = WOB_ANCHOR_CENTER;
config->overflow_mode = WOB_OVERFLOW_MODE_WRAP;
config->output_mode = WOB_OUTPUT_MODE_FOCUSED;
config->default_style.colors.background = (struct wob_color){.a = 1.0f, .r = 0.0f, .g = 0.0f, .b = 0.0f};
config->default_style.colors.value = (struct wob_color){.a = 1.0f, .r = 1.0f, .g = 1.0f, .b = 1.0f};
config->default_style.colors.border = (struct wob_color){.a = 1.0f, .r = 1.0f, .g = 1.0f, .b = 1.0f};
config->default_style.overflow_colors.background = (struct wob_color){.a = 1.0f, .r = 0.0f, .g = 0.0f, .b = 0.0f};
config->default_style.overflow_colors.value = (struct wob_color){.a = 1.0f, .r = 1.0f, .g = 0.0f, .b = 0.0f};
config->default_style.overflow_colors.border = (struct wob_color){.a = 1.0f, .r = 1.0f, .g = 1.0f, .b = 1.0f};
config->default_style.colors.background = (struct wob_color) {.a = 1.0f, .r = 0.0f, .g = 0.0f, .b = 0.0f};
config->default_style.colors.value = (struct wob_color) {.a = 1.0f, .r = 1.0f, .g = 1.0f, .b = 1.0f};
config->default_style.colors.border = (struct wob_color) {.a = 1.0f, .r = 1.0f, .g = 1.0f, .b = 1.0f};
config->default_style.overflow_colors.background = (struct wob_color) {.a = 1.0f, .r = 0.0f, .g = 0.0f, .b = 0.0f};
config->default_style.overflow_colors.value = (struct wob_color) {.a = 1.0f, .r = 1.0f, .g = 0.0f, .b = 0.0f};
config->default_style.overflow_colors.border = (struct wob_color) {.a = 1.0f, .r = 1.0f, .g = 1.0f, .b = 1.0f};

return config;
}
Expand Down
4 changes: 2 additions & 2 deletions src/wob.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ wob_buffer_create_argb8888(int shmid, const struct wob_dimensions dimensions)
wob_log_panic("calloc failed");
}

*wob_buffer = (struct wob_buffer){
*wob_buffer = (struct wob_buffer) {
.wl_buffer = wl_buffer,
.dimensions = dimensions,
.shm_data = shm_data,
Expand Down Expand Up @@ -307,7 +307,7 @@ wob_create_surface(struct wob *app)
wob_log_panic("calloc failed");
}

*rendered = (struct wob_surface){
*rendered = (struct wob_surface) {
.wlr_layer_surface = wlr_layer_surface,
.wl_surface = wl_surface,
.dimensions = dimensions,
Expand Down