From 33f8a02fb5a49c5bfb3fa49084d2f51c05b64509 Mon Sep 17 00:00:00 2001 From: Tamino Bauknecht Date: Thu, 26 Oct 2023 17:19:18 +0200 Subject: [PATCH 1/2] ci: Increase freebsd timeout to 2h After switching to a new FreeBSD action, the job seems to take longer than 30 minutes. Therefore, an increase in the timeout is necessary. --- .github/workflows/freebsd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml index 8da34569..fb2511b5 100644 --- a/.github/workflows/freebsd.yml +++ b/.github/workflows/freebsd.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v3 - name: Test in FreeBSD VM uses: cross-platform-actions/action@v0.19.1 - timeout-minutes: 30 + timeout-minutes: 120 with: operating_system: freebsd version: "13.2" From 7d8c1494d757cc1180fc47135f5676d159918415 Mon Sep 17 00:00:00 2001 From: Tamino Bauknecht Date: Thu, 26 Oct 2023 17:30:48 +0200 Subject: [PATCH 2/2] cpu_usage: Fix ScopeGuard renaming in bsd-only file --- src/modules/cpu_usage/bsd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/cpu_usage/bsd.cpp b/src/modules/cpu_usage/bsd.cpp index 663bc0a7..d795a817 100644 --- a/src/modules/cpu_usage/bsd.cpp +++ b/src/modules/cpu_usage/bsd.cpp @@ -34,7 +34,7 @@ std::vector> waybar::modules::CpuUsage::parseCpuinfo( int ncpu = sysconf(_SC_NPROCESSORS_CONF); size_t sz = CPUSTATES * (ncpu + 1) * sizeof(pcp_time_t); pcp_time_t *cp_time = static_cast(malloc(sz)), *pcp_time = cp_time; - waybar::util::scope_guard cp_time_deleter([cp_time]() { + waybar::util::ScopeGuard cp_time_deleter([cp_time]() { if (cp_time) { free(cp_time); }