From 4569cb40f85c24eb729ce72ab0e4dda227f34677 Mon Sep 17 00:00:00 2001 From: Roman Gershman Date: Thu, 27 Jun 2024 05:33:24 +0300 Subject: [PATCH] chore: fix mac os ci Update the runner to macos 13 following this issue https://github.com/actions/runner-images/issues/9997 Signed-off-by: Roman Gershman --- .github/workflows/mac-os.yml | 22 ++++++++-------------- cmake/third_party.cmake | 6 ++++-- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.github/workflows/mac-os.yml b/.github/workflows/mac-os.yml index 718ac99e..5badc07d 100644 --- a/.github/workflows/mac-os.yml +++ b/.github/workflows/mac-os.yml @@ -15,34 +15,28 @@ env: jobs: build-macos: - runs-on: macos-12 + runs-on: macos-13 timeout-minutes: 30 # ✨✨✨✨ steps: - uses: actions/checkout@v4 - run: | - brew uninstall --formula node kotlin harfbuzz sbt selenium-server imagemagick \ - gradle maven openjdk postgresql r ant mongodb-community@5.0 mongosh \ - node@18 php composer - - # Prevent updating these packages that sometimes break the update - brew pin azure-cli jpeg-xl aom lima pipx gcc - - brew update && brew install --force ninja boost openssl automake libtool + brew update && brew install ninja boost automake - name: Configure CMake run: | cmake --version - gcc-13 --version + gcc-12 --version uname -a cmake -B ${{github.workspace}}/build \ -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \ -GNinja \ - -DCMAKE_C_COMPILER="gcc-13" \ - -DCMAKE_CXX_COMPILER="g++-13" + -DCMAKE_C_COMPILER=gcc-12 \ + -DCMAKE_CXX_COMPILER=g++-12 + - name: Build & Test run: | cd ${{github.workspace}}/build - ninja gperf_project || cat third_party/src/gperf_project-stamp/gperf_project-patch-*.log - + ninja gperf_project || cat third_party/src/gperf_project-stamp/gperf_project-install-*.log + ninja cares_project || cat third_party/src/cares_project-stamp/cares_project-build-*.log ninja -k 5 base/all io/all strings/all util/all echo_server ping_iouring_server \ https_client_cli s3_demo ./fibers_test --logtostderr --gtest_repeat=10 diff --git a/cmake/third_party.cmake b/cmake/third_party.cmake index 346d3e99..37122e76 100644 --- a/cmake/third_party.cmake +++ b/cmake/third_party.cmake @@ -275,7 +275,9 @@ add_third_party( URL https://github.com/gperftools/gperftools/archive/gperftools-2.15.tar.gz # GIT_SHALLOW TRUE - PATCH_COMMAND autoreconf -i # update runs every time for some reason + PATCH_COMMAND echo sed -i "/^noinst_PROGRAMS +=/d;/binary_trees binary_trees_shared/d" + /Makefile.am + COMMAND autoreconf -i # update runs every time for some reason # CMAKE_PASS_FLAGS "-DGPERFTOOLS_BUILD_HEAP_PROFILER=OFF -DGPERFTOOLS_BUILD_HEAP_CHECKER=OFF \ # -DGPERFTOOLS_BUILD_DEBUGALLOC=OFF -DBUILD_TESTING=OFF \ # -Dgperftools_build_benchmark=OFF" @@ -372,7 +374,7 @@ endif() add_third_party( cares - URL https://github.com/c-ares/c-ares/releases/download/cares-1_29_0/c-ares-1.29.0.tar.gz + URL https://codeload.github.com/c-ares/c-ares/tar.gz/refs/tags/v1.31.0 CMAKE_PASS_FLAGS "-DCARES_SHARED:BOOL=OFF -DCARES_STATIC:BOOL=ON -DCARES_STATIC_PIC:BOOL=ON \ -DCMAKE_INSTALL_LIBDIR=lib" )