Skip to content

Commit

Permalink
chore: Downgrade vcpkg to avoid abseil C++20 issue in clang
Browse files Browse the repository at this point in the history
  • Loading branch information
Tradias committed Oct 19, 2024
1 parent d2becc7 commit 084f860
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
- 'CMakePresets.json'

env:
VCPKG_VERSION: 'd567b667adba0e72c5c3931ddbe745b66aa34b73'
VCPKG_VERSION: '821100d967e1737d96414a308e3f7cbe0d1abf18'
CMAKE_ARGS: '-DCMAKE_BUILD_TYPE=Release -DVCPKG_MANIFEST_INSTALL=off -DASIO_GRPC_ENABLE_PKGCONFIG_FALLBACK=off -DCMAKE_COMPILE_WARNING_AS_ERROR=on -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=on -DTHREADS_PREFER_PTHREAD_FLAG=on -DCMAKE_UNITY_BUILD=on'
CTEST_ARGS: '-T test --output-on-failure --timeout 180 --no-tests=error --parallel 25'

Expand Down Expand Up @@ -199,7 +199,7 @@ jobs:
run: ${{ env.VCPKG_ROOT }}/vcpkg install --recurse --clean-after-build --triplet ${{ env.TRIPLET }} --host-triplet ${{ env.TRIPLET }} --x-install-root=${{ runner.workspace }}/vcpkg_installed --overlay-ports=${{ github.workspace }}/deps --overlay-triplets=${{ github.workspace }}/.github/vcpkg

- name: Clang 10 Configure CMake
run: cmake --preset default -B ${{ github.workspace }}/build-10 -DCMAKE_CXX_COMPILER=$(which clang++-10) -DASIO_GRPC_ENABLE_CPP20_TESTS_AND_EXAMPLES=off -DVCPKG_INSTALLED_DIR=${{ runner.workspace }}/vcpkg_installed ${{ env.CMAKE_EXTRA_ARGS }} ${{ env.CMAKE_ARGS }}
run: cmake --preset default -B ${{ github.workspace }}/build-10 -DCMAKE_CXX_COMPILER=$(which clang++-10) -DVCPKG_INSTALLED_DIR=${{ runner.workspace }}/vcpkg_installed ${{ env.CMAKE_EXTRA_ARGS }} ${{ env.CMAKE_ARGS }}

- name: Clang 10 Build
run: cmake --build ${{ github.workspace }}/build-10 --config Release --parallel $(nproc)
Expand Down
2 changes: 1 addition & 1 deletion test/cmake/subdirectory/src/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
"gtest",
"stdexec"
],
"builtin-baseline": "d567b667adba0e72c5c3931ddbe745b66aa34b73"
"builtin-baseline": "821100d967e1737d96414a308e3f7cbe0d1abf18"
}
2 changes: 1 addition & 1 deletion test/cmake/superbuild/src/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
"gtest",
"stdexec"
],
"builtin-baseline": "d567b667adba0e72c5c3931ddbe745b66aa34b73"
"builtin-baseline": "821100d967e1737d96414a308e3f7cbe0d1abf18"
}
2 changes: 1 addition & 1 deletion vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
"gtest",
"stdexec"
],
"builtin-baseline": "d567b667adba0e72c5c3931ddbe745b66aa34b73"
"builtin-baseline": "821100d967e1737d96414a308e3f7cbe0d1abf18"
}

0 comments on commit 084f860

Please sign in to comment.