From 68fe3bb8e1d22bdb1035b7ed6b90ba9405ac89fc Mon Sep 17 00:00:00 2001 From: Keeyou Date: Sun, 3 Dec 2023 09:36:40 +0800 Subject: [PATCH 1/2] bump clang to match chromium 121.0.6162.1 --- .github/workflows/clang-tidy.yml | 2 +- .github/workflows/compiler.yml | 2 +- .github/workflows/releases-android-binary.yml | 2 +- .github/workflows/releases-deb.yml | 2 +- .github/workflows/releases-freebsd-binary.yml | 2 +- .github/workflows/releases-linux-binary.yml | 2 +- .github/workflows/releases-macos.yml | 2 +- .github/workflows/releases-mingw.yml | 2 +- .github/workflows/releases-openwrt-binary.yml | 2 +- .github/workflows/releases-rpm.yml | 2 +- .github/workflows/releases-windows.yml | 2 +- .github/workflows/sanitizers.yml | 2 +- CLANG_REVISION | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml index b5173c951..805059646 100644 --- a/.github/workflows/clang-tidy.yml +++ b/.github/workflows/clang-tidy.yml @@ -16,7 +16,7 @@ on: required: false type: boolean env: - CACHE_EPOCH: 121-1 + CACHE_EPOCH: 121-2 GOPROXY: direct jobs: win-clang-tidy: diff --git a/.github/workflows/compiler.yml b/.github/workflows/compiler.yml index ef8a3ebe7..e6d04c791 100644 --- a/.github/workflows/compiler.yml +++ b/.github/workflows/compiler.yml @@ -28,7 +28,7 @@ on: - '.circleci/**' - '.cirrus.yml' env: - CACHE_EPOCH: 121-1 + CACHE_EPOCH: 121-2 GOPROXY: direct jobs: win-compiler-compatible-2022: diff --git a/.github/workflows/releases-android-binary.yml b/.github/workflows/releases-android-binary.yml index c22972c2a..080d9d982 100644 --- a/.github/workflows/releases-android-binary.yml +++ b/.github/workflows/releases-android-binary.yml @@ -30,7 +30,7 @@ on: release: types: [published] env: - CACHE_EPOCH: 121-1 + CACHE_EPOCH: 121-2 GOPROXY: direct jobs: android-binary-release: diff --git a/.github/workflows/releases-deb.yml b/.github/workflows/releases-deb.yml index cfa067f72..bf3bb99a7 100644 --- a/.github/workflows/releases-deb.yml +++ b/.github/workflows/releases-deb.yml @@ -30,7 +30,7 @@ on: release: types: [published] env: - CACHE_EPOCH: 121-1 + CACHE_EPOCH: 121-2 GOPROXY: direct DH_QUIET: 1 jobs: diff --git a/.github/workflows/releases-freebsd-binary.yml b/.github/workflows/releases-freebsd-binary.yml index a48f87b4c..7db6cc6e7 100644 --- a/.github/workflows/releases-freebsd-binary.yml +++ b/.github/workflows/releases-freebsd-binary.yml @@ -30,7 +30,7 @@ on: release: types: [published] env: - CACHE_EPOCH: 121-1 + CACHE_EPOCH: 121-2 GOPROXY: direct jobs: freebsd-binary-release: diff --git a/.github/workflows/releases-linux-binary.yml b/.github/workflows/releases-linux-binary.yml index e3e7b462a..d7e9a5c2c 100644 --- a/.github/workflows/releases-linux-binary.yml +++ b/.github/workflows/releases-linux-binary.yml @@ -30,7 +30,7 @@ on: release: types: [published] env: - CACHE_EPOCH: 121-1 + CACHE_EPOCH: 121-2 GOPROXY: direct jobs: linux-binary-release: diff --git a/.github/workflows/releases-macos.yml b/.github/workflows/releases-macos.yml index 0424e08a9..f1aa09cce 100644 --- a/.github/workflows/releases-macos.yml +++ b/.github/workflows/releases-macos.yml @@ -30,7 +30,7 @@ on: release: types: [published] env: - CACHE_EPOCH: 121-1 + CACHE_EPOCH: 121-2 GOPROXY: direct jobs: mac-release: diff --git a/.github/workflows/releases-mingw.yml b/.github/workflows/releases-mingw.yml index 820bf5e8e..1b8dc4c6f 100644 --- a/.github/workflows/releases-mingw.yml +++ b/.github/workflows/releases-mingw.yml @@ -30,7 +30,7 @@ on: release: types: [published] env: - CACHE_EPOCH: 121-1 + CACHE_EPOCH: 121-2 GOPROXY: direct jobs: mingw64-release: diff --git a/.github/workflows/releases-openwrt-binary.yml b/.github/workflows/releases-openwrt-binary.yml index 8ac145c68..37f556d8b 100644 --- a/.github/workflows/releases-openwrt-binary.yml +++ b/.github/workflows/releases-openwrt-binary.yml @@ -30,7 +30,7 @@ on: release: types: [published] env: - CACHE_EPOCH: 121-1 + CACHE_EPOCH: 121-2 GOPROXY: direct jobs: openwrt-binary-release: diff --git a/.github/workflows/releases-rpm.yml b/.github/workflows/releases-rpm.yml index c5d3faa2a..76fdfdd4f 100644 --- a/.github/workflows/releases-rpm.yml +++ b/.github/workflows/releases-rpm.yml @@ -30,7 +30,7 @@ on: release: types: [published] env: - CACHE_EPOCH: 121-1 + CACHE_EPOCH: 121-2 GOPROXY: direct jobs: docker_publish: diff --git a/.github/workflows/releases-windows.yml b/.github/workflows/releases-windows.yml index f80699fd4..732a8ac42 100644 --- a/.github/workflows/releases-windows.yml +++ b/.github/workflows/releases-windows.yml @@ -33,7 +33,7 @@ defaults: run: shell: cmd env: - CACHE_EPOCH: 121-1 + CACHE_EPOCH: 121-2 GOPROXY: direct jobs: windows-release: diff --git a/.github/workflows/sanitizers.yml b/.github/workflows/sanitizers.yml index 6f3161b9e..90c0b1ed1 100644 --- a/.github/workflows/sanitizers.yml +++ b/.github/workflows/sanitizers.yml @@ -16,7 +16,7 @@ on: required: false type: boolean env: - CACHE_EPOCH: 121-1 + CACHE_EPOCH: 121-2 GOPROXY: direct jobs: sanitizer-linux: diff --git a/CLANG_REVISION b/CLANG_REVISION index ebcc6c8f5..ffceeb6d3 100644 --- a/CLANG_REVISION +++ b/CLANG_REVISION @@ -1 +1 @@ -llvmorg-18-init-12422-g74cdb8e6-1 \ No newline at end of file +llvmorg-18-init-12938-geb1d5065-1 \ No newline at end of file From 7a52c48b2fc425f546176ea0953f1888202e6c53 Mon Sep 17 00:00:00 2001 From: Keeyou Date: Sun, 3 Dec 2023 09:40:21 +0800 Subject: [PATCH 2/2] bump to c++20 standard --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ce37db255..801b7860a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1324,7 +1324,7 @@ endif() # C11/C++17 compiler flags setup. # -------------------------- set(CMAKE_C_STANDARD 99) -set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) @@ -2255,6 +2255,7 @@ target_compile_definitions(asio PUBLIC ASIO_NO_EXCEPTIONS) target_compile_definitions(asio PUBLIC ASIO_NO_TS_EXECUTORS) target_compile_definitions(asio PUBLIC ASIO_SEPARATE_COMPILATION) target_compile_definitions(asio PUBLIC ASIO_NO_DEPRECATED) +target_compile_definitions(asio PUBLIC ASIO_DISABLE_CO_AWAIT) # forward libcxx present # we control the visiblity target_compile_definitions(asio PUBLIC ASIO_DISABLE_VISIBILITY)