From d8f266984ced3de23c1ca80c9ddda3e2fa48c4bd Mon Sep 17 00:00:00 2001 From: Robin Holzinger Date: Mon, 6 May 2024 01:01:35 +0200 Subject: [PATCH] last attempt for now --- .github/workflows/build_dependencies.yaml | 6 +++--- .github/workflows/workflow.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_dependencies.yaml b/.github/workflows/build_dependencies.yaml index 69a5560ab..b296ce707 100644 --- a/.github/workflows/build_dependencies.yaml +++ b/.github/workflows/build_dependencies.yaml @@ -50,7 +50,7 @@ jobs: with: environment-name: clang cache-environment: true - create-args: clang=${{matrix.compiler.version}} libclang=${{matrix.compiler.version}} clang-tools=${{matrix.compiler.version}} + create-args: clang=${{matrix.compiler.version}} libclang=${{matrix.compiler.version}} clang-tools=${{matrix.compiler.version}} libcxx libcxxabi # gcc_linux-64=${{matrix.compiler.version}} gxx_linux-64=${{matrix.compiler.version}} - name: Create build and artifact directories @@ -67,8 +67,8 @@ jobs: -DCMAKE_BUILD_TYPE=${{matrix.build-type}} -DCMAKE_C_COMPILER=${{matrix.compiler.c}} -DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}} - -DCMAKE_CXX_FLAGS="${{ matrix.compiler.cxx == 'clang++' && '-stdlib=libc++ -std=c++20' || ''}} -fdebug-prefix-map=${{github.workspace}}/build=." - -DCMAKE_CXX_STANDARD_LIBRARIES="${{ matrix.compiler.cxx == 'clang++' && '-lc++ -lc++abi' || ''}}" + -DCMAKE_CXX_FLAGS="${{ matrix.compiler.cxx == 'clang++' && '-stdlib=libc++ -std=c++20 -lc++ -lc++abi' || ''}} -L$CONDA_PREFIX/lib -I$CONDA_PREFIX/include/c++/v1 -fdebug-prefix-map=${{github.workspace}}/build=." + -DCMAKE_LIBRARY_PATH="$CONDA_PREFIX/lib:$LD_LIBRARY_PATH" -DgRPC_PROTOBUF_PROVIDER=module -DABSL_ENABLE_INSTALL=On -DgRPC_INSTALL=ON diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 5523de38a..95390d454 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -216,7 +216,7 @@ jobs: with: environment-name: clang cache-environment: true - create-args: clang=${{matrix.compiler.version}} libclang=${{matrix.compiler.version}} clang-tools=${{matrix.compiler.version}} + create-args: clang=${{matrix.compiler.version}} clang-tools=${{matrix.compiler.version}} libclang=${{matrix.compiler.version}} libcxx libcxxabi # gcc_linux-64=${{matrix.compiler.version}} gxx_linux-64=${{matrix.compiler.version}} - name: Setup pre-built grpc binaries @@ -244,8 +244,8 @@ jobs: -DCMAKE_BUILD_TYPE=${{matrix.build-type}} -DCMAKE_C_COMPILER=${{matrix.compiler.c}} -DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}} - -DCMAKE_CXX_FLAGS="${{ matrix.compiler.cxx == 'clang++' && '-stdlib=libc++ -std=c++20' || ''}} -fdebug-prefix-map=${{github.workspace}}/build=." - -DCMAKE_CXX_STANDARD_LIBRARIES="${{ matrix.compiler.cxx == 'clang++' && '-lc++ -lc++abi' || ''}}" + -DCMAKE_CXX_FLAGS="${{ matrix.compiler.cxx == 'clang++' && '-stdlib=libc++ -std=c++20 -lc++ -lc++abi' || ''}} -L$CONDA_PREFIX/lib -I$CONDA_PREFIX/include/c++/v1 -fdebug-prefix-map=${{github.workspace}}/build=." + -DCMAKE_LIBRARY_PATH="$CONDA_PREFIX/lib:$LD_LIBRARY_PATH" -DMODYN_TRY_LOCAL_GRPC=ON -DMODYN_BUILD_PLAYGROUND=ON -DMODYN_BUILD_TESTS=ON