From 1b51d23b51a16cc226ab023db4cba8f1bde1e4e6 Mon Sep 17 00:00:00 2001 From: Brad House Date: Wed, 8 Jan 2025 11:43:30 -0500 Subject: [PATCH] CI: GitHub actions ubuntu-latest now points to 24.04 causing some minor issues (#957) Containerized tests now need to be run with sudo to gain access to chroot(). Also, `gcov` in ubuntu 24.04 is broken with googletest so revert back to 22.04 for coverage. Finally, codespell is updated in 24.04 to detect more issues and there were some typos that needed to be fixed. Signed-off-by: Brad House (@bradh352) --- .github/workflows/ubuntu.yml | 10 +++++----- include/ares_dns_record.h | 2 +- src/lib/ares_event_win32.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 10e43e8d..74a6cf17 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -33,7 +33,7 @@ jobs: TEST_DEBUGGER: gdb run: | ./ci/build.sh - ./ci/test.sh + sudo ./ci/test.sh - name: "Autotools: build and test c-ares" env: BUILD_TYPE: autotools @@ -50,7 +50,7 @@ jobs: TEST_DEBUGGER: gdb run: | ./ci/build.sh - ./ci/test.sh + sudo ./ci/test.sh - name: "CMake: (hide symbols) build and test c-ares" env: BUILD_TYPE: CMAKE @@ -59,7 +59,7 @@ jobs: TEST_DEBUGGER: gdb run: | ./ci/build.sh - ./ci/test.sh + sudo ./ci/test.sh - name: "CMake: UBSAN: build and test c-ares" env: BUILD_TYPE: "ubsan" @@ -72,7 +72,7 @@ jobs: TEST_DEBUGGER: "none" run: | ./ci/build.sh - ./ci/test.sh + sudo ./ci/test.sh - name: "CMake: ASAN: build and test c-ares" env: BUILD_TYPE: "asan" @@ -105,4 +105,4 @@ jobs: TEST_DEBUGGER: "lldb" run: | ./ci/build.sh - ./ci/test.sh + sudo ./ci/test.sh diff --git a/include/ares_dns_record.h b/include/ares_dns_record.h index 8d09bd0a..0f04601a 100644 --- a/include/ares_dns_record.h +++ b/include/ares_dns_record.h @@ -1006,7 +1006,7 @@ CARES_EXTERN ares_status_t ares_dns_write(const ares_dns_record_t *dnsrec, * (such as the ttl decrement capability). * * \param[in] dnsrec Pointer to initialized and filled DNS record object. - * \return duplicted DNS record object, or NULL on out of memory. + * \return duplicated DNS record object, or NULL on out of memory. */ CARES_EXTERN ares_dns_record_t * ares_dns_record_duplicate(const ares_dns_record_t *dnsrec); diff --git a/src/lib/ares_event_win32.c b/src/lib/ares_event_win32.c index 39a07ae8..b5f2b035 100644 --- a/src/lib/ares_event_win32.c +++ b/src/lib/ares_event_win32.c @@ -665,7 +665,7 @@ static ares_bool_t ares_evsys_win32_afd_cancel(ares_evsys_win32_eventdata_t *ed) /* NtCancelIoFileEx() may return STATUS_NOT_FOUND if the operation completed * just before calling NtCancelIoFileEx(), but we have not yet received the - * notifiction (but it should be queued for the next IOCP event). */ + * notification (but it should be queued for the next IOCP event). */ if (status == STATUS_SUCCESS || status == STATUS_NOT_FOUND) { return ARES_TRUE; }