Skip to content

Commit 8ed21de

Browse files
committed
Using Ubuntu 26.04 in github actions
1 parent 373cab9 commit 8ed21de

4 files changed

Lines changed: 10 additions & 9 deletions

File tree

.github/workflows/cmake.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ jobs:
88
# well on Windows or Mac. You can convert this to a matrix build if you need
99
# cross-platform coverage.
1010
# See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
11-
runs-on: ubuntu-24.04
11+
runs-on: ubuntu-26.04
1212

1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
compiler: [gcc-13, clang-18]
16+
compiler: [gcc-15, clang-22]
1717

1818
steps:
1919
- uses: actions/checkout@main

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,8 @@ if(USE_CLANG_TIDY)
132132
string(APPEND CLANG_TIDY_CHECKS "-bugprone-easily-swappable-parameters,-*magic-numbers,-hicpp-signed-bitwise,")
133133
string(APPEND CLANG_TIDY_CHECKS "-readability-function-cognitive-complexity,-altera-id-dependent-backward-branch,")
134134
string(APPEND CLANG_TIDY_CHECKS "-misc-include-cleaner,-llvmlibc-restrict-system-libc-headers,")
135-
string(APPEND CLANG_TIDY_CHECKS "-clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling")
135+
string(APPEND CLANG_TIDY_CHECKS "-clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,")
136+
string(APPEND CLANG_TIDY_CHECKS "-*function-size,-clang-diagnostic-*variadic-macro-arguments*")
136137
set(DO_CLANG_TIDY "${CLANG_TIDY_EXE}" "-fix" "-fix-errors" "${CLANG_TIDY_CHECKS}")
137138
endif()
138139
else()

src/dns_poller.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ static ev_tstamp get_timeout(dns_poller_t *d)
163163
static struct timeval max_tv = {.tv_sec = 5, .tv_usec = 0};
164164
struct timeval tv;
165165
struct timeval *tvp = ares_timeout(d->ares, &max_tv, &tv);
166-
ev_tstamp after = (double)tvp->tv_sec + (double)tvp->tv_usec * 1e-6;
166+
ev_tstamp after = (double)tvp->tv_sec + ((double)tvp->tv_usec * 1e-6);
167167
return after > 0.1 ? after : 0.1;
168168
}
169169

src/https_client.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ static curl_socket_t opensocket_callback(void *clientp, curlsocktype purpose,
9898
stat_connection_opened(client->stat);
9999
}
100100

101-
#if defined(IP_TOS)
101+
#ifdef IP_TOS
102102
if (purpose != CURLSOCKTYPE_IPCXN) {
103103
return sock;
104104
}
@@ -107,7 +107,7 @@ static curl_socket_t opensocket_callback(void *clientp, curlsocktype purpose,
107107
setsockopt(sock, IPPROTO_IP, IP_TOS,
108108
&client->opt->dscp, sizeof(client->opt->dscp));
109109
}
110-
#if defined(IPV6_TCLASS)
110+
#ifdef IPV6_TCLASS
111111
else if (addr->family == AF_INET6) {
112112
setsockopt(sock, IPPROTO_IPV6, IPV6_TCLASS,
113113
&client->opt->dscp, sizeof(client->opt->dscp));
@@ -148,7 +148,7 @@ static void https_log_data(int level, struct https_fetch_ctx *ctx,
148148
const size_t width = 0x10;
149149

150150
for (size_t i = 0; i < size; i += width) {
151-
char hex[3 * width + 1];
151+
char hex[(3 * width) + 1];
152152
char str[width + 1];
153153
size_t hex_off = 0;
154154
size_t str_off = 0;
@@ -660,8 +660,8 @@ static void https_client_multi_init(https_client_t *c, struct curl_slist *header
660660
c->header_list = header_list;
661661

662662
ASSERT_CURL_MULTI_SETOPT(c->curlm, CURLMOPT_PIPELINING, CURLPIPE_MULTIPLEX);
663-
ASSERT_CURL_MULTI_SETOPT(c->curlm, CURLMOPT_MAX_TOTAL_CONNECTIONS, HTTPS_CONNECTION_LIMIT);
664-
ASSERT_CURL_MULTI_SETOPT(c->curlm, CURLMOPT_MAX_HOST_CONNECTIONS, HTTPS_CONNECTION_LIMIT);
663+
ASSERT_CURL_MULTI_SETOPT(c->curlm, CURLMOPT_MAX_TOTAL_CONNECTIONS, (long)HTTPS_CONNECTION_LIMIT);
664+
ASSERT_CURL_MULTI_SETOPT(c->curlm, CURLMOPT_MAX_HOST_CONNECTIONS, (long)HTTPS_CONNECTION_LIMIT);
665665
ASSERT_CURL_MULTI_SETOPT(c->curlm, CURLMOPT_SOCKETDATA, c);
666666
ASSERT_CURL_MULTI_SETOPT(c->curlm, CURLMOPT_SOCKETFUNCTION, multi_sock_cb);
667667
ASSERT_CURL_MULTI_SETOPT(c->curlm, CURLMOPT_TIMERDATA, c);

0 commit comments

Comments
 (0)