From d032ab91fd0b925fe1706194867ba0cd2d91c2cd Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sun, 2 Jun 2024 18:59:05 +0300 Subject: [PATCH 1/2] Update ci.yml --- .github/workflows/ci.yml | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 592f84e..0613090 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,8 +49,7 @@ jobs: install: g++-10 - toolset: gcc-11 cxxstd: "11,14,17,2a" - os: ubuntu-20.04 - install: g++-11 + os: ubuntu-22.04 - toolset: gcc-12 cxxstd: "11,14,17,20,2b" os: ubuntu-22.04 @@ -60,6 +59,11 @@ jobs: os: ubuntu-latest container: ubuntu:23.04 install: g++-13 + - toolset: gcc-14 + cxxstd: "11,14,17,20,2b" + os: ubuntu-latest + container: ubuntu:24.04 + install: g++-14 - toolset: clang compiler: clang++-3.9 cxxstd: "11,14" @@ -141,14 +145,20 @@ jobs: os: ubuntu-latest install: clang-17 - toolset: clang - cxxstd: "11,14,17,2a" - os: macos-11 + compiler: clang++-18 + cxxstd: "11,14,17,20,2b" + container: ubuntu:24.04 + os: ubuntu-latest + install: clang-18 - toolset: clang cxxstd: "11,14,17,20,2b" os: macos-12 - toolset: clang cxxstd: "11,14,17,20,2b" os: macos-13 + - toolset: clang + cxxstd: "11,14,17,20,2b" + os: macos-14 runs-on: ${{matrix.os}} container: ${{matrix.container}} @@ -270,9 +280,9 @@ jobs: include: - os: ubuntu-20.04 - os: ubuntu-22.04 - - os: macos-11 - os: macos-12 - os: macos-13 + - os: macos-14 runs-on: ${{matrix.os}} @@ -318,9 +328,9 @@ jobs: include: - os: ubuntu-20.04 - os: ubuntu-22.04 - - os: macos-11 - os: macos-12 - os: macos-13 + - os: macos-14 runs-on: ${{matrix.os}} @@ -376,9 +386,9 @@ jobs: include: - os: ubuntu-20.04 - os: ubuntu-22.04 - - os: macos-11 - os: macos-12 - os: macos-13 + - os: macos-14 runs-on: ${{matrix.os}} From be5a8ffa80f66489be45e6a88f97f6d51a31a376 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sun, 2 Jun 2024 19:45:18 +0300 Subject: [PATCH 2/2] Disable -Wformat-truncation for Clang in snprintf_test --- test/snprintf_test.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/snprintf_test.cpp b/test/snprintf_test.cpp index 4064125..34e4eaa 100644 --- a/test/snprintf_test.cpp +++ b/test/snprintf_test.cpp @@ -6,6 +6,12 @@ # pragma GCC diagnostic ignored "-Wformat-truncation" #endif +#if defined(__clang__) && defined(__has_warning) +# if __has_warning( "-Wformat-truncation" ) +# pragma clang diagnostic ignored "-Wformat-truncation" +# endif +#endif + #include #include