Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[1.46] shared abseil on windows + test overhaul #239

Merged
merged 15 commits into from
Sep 5, 2022
Merged

[1.46] shared abseil on windows + test overhaul #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e12ae69
move library tests out of run_test.{sh,bat} and expand
h-vetinari Aug 31, 2022
4cf9f32
clean up %ERRORLEVEL% in windows builds scripts
h-vetinari Aug 31, 2022
f4d2085
compile upstream cpp example as test
h-vetinari Aug 31, 2022
5f2c86d
add tests for pkg-config
h-vetinari Aug 31, 2022
c849cd5
rename test scripts
h-vetinari Aug 31, 2022
e789990
fix test
h-vetinari Sep 1, 2022
3ae591c
switch to shared abseil also on windows
h-vetinari Sep 3, 2022
6d77fcc
remove abseil license again
h-vetinari Sep 3, 2022
4fcbbe5
unify & normalize patches
h-vetinari Sep 3, 2022
6727731
switch to C++17 for grpcio consistently
h-vetinari Sep 3, 2022
532010a
adapt linkage to shared abseil builds
h-vetinari Sep 3, 2022
4df0882
fix folder path in test_grpc.sh
h-vetinari Sep 3, 2022
298735a
more example subfolders necessary
h-vetinari Sep 4, 2022
27ad3ae
disable cmake compilation tests on unix for now
h-vetinari Sep 4, 2022
1ce99af
MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and co…
h-vetinari Sep 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci_support/win_64_libprotobuf3.20openssl1.1.1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ channel_targets:
- conda-forge main
cxx_compiler:
- vs2019
libabseil_static:
libabseil:
- '20220623.0'
libprotobuf:
- '3.20'
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_libprotobuf3.20openssl3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ channel_targets:
- conda-forge main
cxx_compiler:
- vs2019
libabseil_static:
libabseil:
- '20220623.0'
libprotobuf:
- '3.20'
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_libprotobuf3.21openssl1.1.1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ channel_targets:
- conda-forge main
cxx_compiler:
- vs2019
libabseil_static:
libabseil:
- '20220623.0'
libprotobuf:
- '3.21'
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_libprotobuf3.21openssl3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ channel_targets:
- conda-forge main
cxx_compiler:
- vs2019
libabseil_static:
libabseil:
- '20220623.0'
libprotobuf:
- '3.21'
Expand Down
203 changes: 0 additions & 203 deletions recipe/ABSEIL_LICENSE
View file
Open in desktop

This file was deleted.

8 changes: 3 additions & 5 deletions recipe/build-cpp.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,11 @@ set CFLAGS=
set CXXFLAGS=

mkdir build-cpp
if errorlevel 1 exit 1

cd build-cpp

cmake .. ^
-GNinja ^
-DCMAKE_CXX_STANDARD=11 ^
-DCMAKE_CXX_STANDARD=17 ^
-DCMAKE_BUILD_TYPE=Release ^
-DCMAKE_PREFIX_PATH=%CONDA_PREFIX% ^
-DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^
Expand All @@ -26,7 +24,7 @@ cmake .. ^
-DgRPC_SSL_PROVIDER="package" ^
-DgRPC_RE2_PROVIDER="package" ^
-DgRPC_ZLIB_PROVIDER="package"
if %ERRORLEVEL% neq 0 exit 1

cmake --build . --config Release --target install

if errorlevel 1 exit 1
if %ERRORLEVEL% neq 0 exit 1
2 changes: 1 addition & 1 deletion recipe/build-grpcio.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ set "GRPC_PYTHON_CFLAGS=/DPB_FIELD_16BIT"
del src\python\grpcio\grpc\_cython\cygrpc.cpp

"%PYTHON%" -m pip install . --no-deps --ignore-installed --no-cache-dir -v
if errorlevel 1 exit 1
if %ERRORLEVEL% neq 0 exit 1
3 changes: 0 additions & 3 deletions recipe/cf_test/CMakeLists.txt
View file
Open in desktop

This file was deleted.

Loading