From a1860355aaa3d14174c48feb933c270d8a872f93 Mon Sep 17 00:00:00 2001 From: Colin Ihrig Date: Thu, 15 Dec 2022 21:00:22 -0500 Subject: [PATCH] build: update libuv version (#180) v1.40.0 came out July 19, 2021. It's now Dec. 2022. The windows ASAN job in CI is also disabled, but should be OK to bring back in the next libuv bump. --- .github/workflows/CI.yml | 6 ++++-- CMakeLists.txt | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 1270cd4..088a777 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -14,8 +14,10 @@ jobs: include: - os: ubuntu-latest config: {variation: 'ASAN', generate_options: '-DASAN=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Wall -Werror"'} - - os: windows-latest - config: {variation: 'ASAN', generate_options: '-DASAN=ON -DCMAKE_BUILD_TYPE=Debug'} + # This is currently broken in the latest libuv release, but fixed on + # the main branch. Just disable this until libuv v1.45.0 is released. + # - os: windows-latest + # config: {variation: 'ASAN', generate_options: '-DASAN=ON -DCMAKE_BUILD_TYPE=Debug'} - os: ubuntu-latest config: {variation: 'debug-log', generate_options: '-DUVWASI_DEBUG_LOG=ON -DCMAKE_C_FLAGS="-Wall -Werror"'} steps: diff --git a/CMakeLists.txt b/CMakeLists.txt index b35b1a0..f71c36d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ project (uvwasi LANGUAGES C) list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") # This can be a commit hash or tag -set(LIBUV_VERSION v1.42.0) +set(LIBUV_VERSION v1.44.2) include(CMakeDependentOption) cmake_dependent_option(UVWASI_BUILD_TESTS @@ -40,7 +40,7 @@ else (WITH_SYSTEM_LIBUV) libuv GIT_REPOSITORY https://github.com/libuv/libuv.git GIT_TAG ${LIBUV_VERSION}) - + FetchContent_GetProperties(libuv) if(NOT libuv_POPULATED) FetchContent_Populate(libuv)