Skip to content

Commit 86cf8b1

Browse files
committed
Revert unstable ANT EDX flags in CI workflows
1 parent 5f87f2c commit 86cf8b1

2 files changed

Lines changed: 4 additions & 16 deletions

File tree

.github/workflows/run_unix.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,9 @@ jobs:
3333
if: (matrix.os == 'ubuntu-latest')
3434
run: |
3535
sudo -H apt-get update -y
36-
sudo -H apt-get install -y python3-setuptools python3-pygments libbluetooth-dev libprotobuf-dev protobuf-compiler libgrpc++-dev protobuf-compiler-grpc
36+
sudo -H apt-get install -y python3-setuptools python3-pygments libbluetooth-dev
3737
env:
3838
DEBIAN_FRONTEND: noninteractive
39-
- name: Install ANT EDX Dependencies MacOS
40-
if: (matrix.os == 'macos-14')
41-
run: |
42-
brew update
43-
brew install protobuf grpc
4439
- name: Install Node
4540
uses: actions/setup-node@v3
4641
with:
@@ -80,7 +75,7 @@ jobs:
8075
run: |
8176
mkdir $GITHUB_WORKSPACE/build
8277
cd $GITHUB_WORKSPACE/build
83-
cmake -G Ninja -DBRAINFLOW_VERSION=$BRAINFLOW_VERSION -DBUILD_ONNX=ON -DBUILD_BLUETOOTH=ON -DBUILD_ANT_EDX=ON -DBUILD_TESTS=ON -DWARNINGS_AS_ERRORS=ON -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/installed -DCMAKE_BUILD_TYPE=Release ..
78+
cmake -G Ninja -DBRAINFLOW_VERSION=$BRAINFLOW_VERSION -DBUILD_ONNX=ON -DBUILD_BLUETOOTH=ON -DBUILD_TESTS=ON -DWARNINGS_AS_ERRORS=ON -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/installed -DCMAKE_BUILD_TYPE=Release ..
8479
ninja
8580
ninja install
8681
env:
@@ -90,7 +85,7 @@ jobs:
9085
run: |
9186
mkdir $GITHUB_WORKSPACE/build
9287
cd $GITHUB_WORKSPACE/build
93-
cmake -DBRAINFLOW_VERSION=$BRAINFLOW_VERSION -DBUILD_BLUETOOTH=ON -DBUILD_ONNX=ON -DBUILD_ANT_EDX=ON -DBUILD_TESTS=ON -DWARNINGS_AS_ERRORS=ON -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/installed -DCMAKE_BUILD_TYPE=Release ..
88+
cmake -DBRAINFLOW_VERSION=$BRAINFLOW_VERSION -DBUILD_BLUETOOTH=ON -DBUILD_ONNX=ON -DBUILD_TESTS=ON -DWARNINGS_AS_ERRORS=ON -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/installed -DCMAKE_BUILD_TYPE=Release ..
9489
make
9590
make install
9691
env:

.github/workflows/run_windows.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,6 @@ jobs:
4040
uses: actions/setup-java@v1
4141
with:
4242
java-version: 11.0.3
43-
- name: Install ANT EDX Dependencies
44-
run: |
45-
git clone https://github.com/microsoft/vcpkg.git %GITHUB_WORKSPACE%\vcpkg
46-
cd %GITHUB_WORKSPACE%\vcpkg
47-
bootstrap-vcpkg.bat
48-
vcpkg install grpc:x64-windows
49-
shell: cmd
5043
- uses: hecrj/setup-rust-action@v2
5144
with:
5245
rust-version: stable
@@ -65,7 +58,7 @@ jobs:
6558
run: |
6659
mkdir %GITHUB_WORKSPACE%\build64
6760
cd %GITHUB_WORKSPACE%\build64
68-
cmake -DBRAINFLOW_VERSION=%BRAINFLOW_VERSION% -DBUILD_OYMOTION_SDK=ON -DBUILD_ONNX=ON -DBUILD_BLE=ON -DBUILD_BLUETOOTH=ON -DBUILD_ANT_EDX=ON -DWARNINGS_AS_ERRORS=ON -G "Visual Studio 17 2022" -A x64 -DCMAKE_SYSTEM_VERSION=8.1 -DCMAKE_TOOLCHAIN_FILE=%GITHUB_WORKSPACE%\vcpkg\scripts\buildsystems\vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows -DCMAKE_INSTALL_PREFIX=..\installed64\ ..
61+
cmake -DBRAINFLOW_VERSION=%BRAINFLOW_VERSION% -DBUILD_OYMOTION_SDK=ON -DBUILD_ONNX=ON -DBUILD_BLE=ON -DBUILD_BLUETOOTH=ON -DWARNINGS_AS_ERRORS=ON -G "Visual Studio 17 2022" -A x64 -DCMAKE_SYSTEM_VERSION=8.1 -DCMAKE_INSTALL_PREFIX=..\installed64\ ..
6962
cmake --build . --target install --config Release -j 2 --parallel 2
7063
env:
7164
BRAINFLOW_VERSION: ${{ steps.version.outputs.version }}

0 commit comments

Comments
 (0)