Skip to content

Commit

Permalink
migrate circeci to github actions + fixes
Browse files Browse the repository at this point in the history
Summary:
1. Migrate circleci to github actions.
2. Remove deleted test mem_test.cc.
3. Remove reference to win.cc and win.h.
4. Remove deleted test tls_tcp_test.cc
5. Remove left behind CMakeLists.txt file in libuv directory.

Test Plan:
Test on github.

Reviewers:

Subscribers:

Tasks:

Tags:
  • Loading branch information
c-p-i-o committed Oct 30, 2024
1 parent 9a6b9dc commit 3ffb3a0
Show file tree
Hide file tree
Showing 6 changed files with 75 additions and 55 deletions.
75 changes: 75 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
name: CI
on:
push:
branches:
- main
pull_request:

jobs:
windows_build:
runs-on: windows-latest
env:
gtest_lib_path: c:/googletest
libuv_path: c:/libuv
steps:
- uses: conda-incubator/setup-miniconda@v3
with:
miniconda-version: "latest"
- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v2
- name: Checkout code
uses: actions/checkout@v4
- name: Set up Python 3.10
uses: actions/setup-python@v3
with:
python-version: '3.10'
- name: Add conda to system path
run: |
# $CONDA is an environment variable pointing to the root of the miniconda directory
echo $CONDA/bin >> $GITHUB_PATH
- name: Conda info
shell: bash -l {0}
run: conda info
- name: Setup build environment
run: |
conda create -n py376_build python=3.7.6
conda activate py376_build
conda install cmake
- name: Install libuv
run: |
conda activate py376_build
curl https://dist.libuv.org/dist/v1.38.0/libuv-v1.38.0.tar.gz --output libuv-v1.38.0.tar.gz
tar xzvf libuv-v1.38.0.tar.gz
cd libuv-v1.38.0
mkdir -p build
cd build
mkdir -p ${{ env.gtest_lib_path }}
cmake .. -DCMAKE_INSTALL_PREFIX=${{ env.libuv_path }}
msbuild INSTALL.vcxproj
- name: Install googletest
run: |
conda activate py376_build
curl https://codeload.github.com/google/googletest/tar.gz/release-1.10.0 --output googletest-release-1.10.0.tar.gz
tar xzvf googletest-release-1.10.0.tar.gz
cd googletest-release-1.10.0
mkdir -p build
cd build
if (Test-Path -Path ${{ env.gtest_lib_path }}) {
echo "Directory already exists"
} else {
mkdir ${{ env.gtest_lib_path }}
}
cmake .. -DCMAKE_INSTALL_PREFIX=${{ env.gtest_lib_path }} -Dgtest_force_shared_crt=ON
msbuild INSTALL.vcxproj
- name: Build
run: |
conda activate py376_build
git submodule sync
git submodule update --init --recursive
mkdir -p build
cd build
cmake .. -DBUILD_TEST=ON -Dlibuv_ROOT=${{ env.libuv_path }} -DGTEST_LIBRARY=${{ env.gtest_lib_path }}/lib/gtestd.lib -DGTEST_INCLUDE_DIR=${{ env.gtest_lib_path }}/include -DGTEST_MAIN_LIBRARY=${{ env.gtest_lib_path }}/lib/gtest_maind.lib
msbuild ALL_BUILD.vcxproj
- name: Test
run: |
build/gloo/test/Debug/gloo_test.exe
9 changes: 0 additions & 9 deletions gloo/common/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,6 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
)
endif()

if(MSVC)
list(APPEND GLOO_COMMON_HDRS
"${CMAKE_CURRENT_SOURCE_DIR}/win.h"
)
list(APPEND GLOO_COMMON_SRCS
"${CMAKE_CURRENT_SOURCE_DIR}/win.cc"
)
endif()

list(APPEND GLOO_SRCS ${GLOO_COMMON_SRCS})
list(APPEND GLOO_HDRS ${GLOO_COMMON_HDRS})
set(GLOO_SRCS ${GLOO_SRCS} PARENT_SCOPE)
Expand Down
2 changes: 0 additions & 2 deletions gloo/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,9 @@ set(GLOO_TEST_SRCS
"${CMAKE_CURRENT_SOURCE_DIR}/gather_test.cc"
"${CMAKE_CURRENT_SOURCE_DIR}/gatherv_test.cc"
"${CMAKE_CURRENT_SOURCE_DIR}/main.cc"
"${CMAKE_CURRENT_SOURCE_DIR}/memory_test.cc"
"${CMAKE_CURRENT_SOURCE_DIR}/openssl_utils.cc"
"${CMAKE_CURRENT_SOURCE_DIR}/reduce_test.cc"
"${CMAKE_CURRENT_SOURCE_DIR}/send_recv_test.cc"
"${CMAKE_CURRENT_SOURCE_DIR}/tls_tcp_test.cc"
)
set(GLOO_TEST_LIBRARIES)

Expand Down
4 changes: 0 additions & 4 deletions gloo/transport/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ if(GLOO_HAVE_TRANSPORT_IBVERBS)
add_subdirectory(ibverbs)
endif()

if(GLOO_HAVE_TRANSPORT_UV)
add_subdirectory(uv)
endif()

list(APPEND GLOO_SRCS ${GLOO_TRANSPORT_SRCS})
list(APPEND GLOO_HDRS ${GLOO_TRANSPORT_HDRS})
set(GLOO_SRCS ${GLOO_SRCS} PARENT_SCOPE)
Expand Down
19 changes: 0 additions & 19 deletions gloo/transport/uv/CMakeLists.txt

This file was deleted.

21 changes: 0 additions & 21 deletions gloo/transport/uv/LICENSE.uvw

This file was deleted.

0 comments on commit 3ffb3a0

Please sign in to comment.