Skip to content

Commit 3c11430

Browse files
Andrey1994Andrey1994
authored
fixing ci, macos 11 runners are removed from github actions (#732)
* fixing ci Signed-off-by: Andrey Parfenov <a1994ndrey@gmail.com> * bump manylinux Signed-off-by: Andrey Parfenov <a1994ndrey@gmail.com> * fixing cmake path in manylinux * fixing macos runners Signed-off-by: Andrey Parfenov <a1994ndrey@gmail.com> * fixing deprecated warning in macos Signed-off-by: Andrey Parfenov <a1994ndrey@gmail.com> --------- Signed-off-by: Andrey Parfenov <a1994ndrey@gmail.com>
1 parent ac5a2dd commit 3c11430

4 files changed

Lines changed: 19 additions & 20 deletions

File tree

‎.github/workflows/deploy_cpp_libs.yml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
max-parallel: 16
6060
matrix:
6161
build_type: [Release, Debug]
62-
os: [ubuntu-latest, macos-11.0]
62+
os: [ubuntu-latest, macos-12]
6363

6464
steps:
6565
- name: Clone Repository
@@ -69,13 +69,13 @@ jobs:
6969
with:
7070
cmake-version: '3.21.x'
7171
- name: Install Ninja
72-
if: (matrix.os == 'macos-11.0')
72+
if: (matrix.os == 'macos-12')
7373
uses: seanmiddleditch/gha-setup-ninja@master
7474
with:
7575
version: 1.10.2
7676
# build simpleble outside from brainflow because of different deployment targets
7777
- name: Compile SimpleBLE MacOS
78-
if: (matrix.os == 'macos-11.0')
78+
if: (matrix.os == 'macos-12')
7979
run: |
8080
mkdir $GITHUB_WORKSPACE/third_party/SimpleBLE/simpleble/build
8181
cd $GITHUB_WORKSPACE/third_party/SimpleBLE/simpleble/build
@@ -86,7 +86,7 @@ jobs:
8686
env:
8787
BUILD: ${{ matrix.build_type }}
8888
- name: Compile BrainFlow for MacOS
89-
if: (matrix.os == 'macos-11.0')
89+
if: (matrix.os == 'macos-12')
9090
run: |
9191
mkdir $GITHUB_WORKSPACE/build
9292
cd $GITHUB_WORKSPACE/build
@@ -99,9 +99,8 @@ jobs:
9999
- name: Compile BrainFlow in ManyLinux
100100
if: (matrix.os == 'ubuntu-latest')
101101
run: |
102-
docker pull dockcross/manylinux2014-x64:20210708-94745ff
103-
docker run -e GITHUB_WORKSPACE=$GITHUB_WORKSPACE -e BUILD=$BUILD -v $GITHUB_WORKSPACE:$GITHUB_WORKSPACE dockcross/manylinux2014-x64:20210708-94745ff /bin/bash -c "yum install -y bluez-libs-devel dbus-devel && /opt/python/cp36-cp36m/bin/pip3.6 install cmake==3.21.4 && cd $GITHUB_WORKSPACE && mkdir build_docker && cd build_docker && /opt/_internal/cpython-3.6.14/bin/cmake -DBUILD_BLE=ON -DBUILD_BLUETOOTH=ON -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/artifacts/linux_${BUILD} -DCMAKE_BUILD_TYPE=$BUILD .. && make && make install"
104-
102+
docker pull dockcross/manylinux_2_28-x64:20240418-88c04a4
103+
docker run -e GITHUB_WORKSPACE=$GITHUB_WORKSPACE -e BUILD=$BUILD -v $GITHUB_WORKSPACE:$GITHUB_WORKSPACE dockcross/manylinux_2_28-x64:20240418-88c04a4 /bin/bash -c "yum install -y bluez-libs-devel dbus-devel && /opt/python/cp36-cp36m/bin/pip3.6 install cmake==3.21.4 && cd $GITHUB_WORKSPACE && mkdir build_docker && cd build_docker && /opt/_internal/cpython-3.6.15/bin/cmake -DBUILD_BLE=ON -DBUILD_BLUETOOTH=ON -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/artifacts/linux_${BUILD} -DCMAKE_BUILD_TYPE=$BUILD .. && make && make install"
105104
env:
106105
BUILD: ${{ matrix.build_type }}
107106
- name: Upload Artifacts

‎.github/workflows/run_unix.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
fail-fast: false
1111
max-parallel: 4
1212
matrix:
13-
os: [ubuntu-20.04, macos-11.0]
13+
os: [ubuntu-20.04, macos-12]
1414

1515
steps:
1616
# compile and prepare env
@@ -45,7 +45,7 @@ jobs:
4545
run: |
4646
npm install -g ts-node
4747
- name: Install Ninja
48-
if: (matrix.os == 'macos-11.0')
48+
if: (matrix.os == 'macos-12')
4949
uses: seanmiddleditch/gha-setup-ninja@master
5050
with:
5151
version: 1.10.2
@@ -63,15 +63,15 @@ jobs:
6363
java-version: 11.0.3
6464
# build simpleble outside from brainflow because of different deployment targets
6565
- name: Compile SimpleBLE MacOS
66-
if: (matrix.os == 'macos-11.0')
66+
if: (matrix.os == 'macos-12')
6767
run: |
6868
mkdir $GITHUB_WORKSPACE/third_party/SimpleBLE/simpleble/build
6969
cd $GITHUB_WORKSPACE/third_party/SimpleBLE/simpleble/build
7070
cmake -G Ninja -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/installed -DCMAKE_BUILD_TYPE=Release ..
7171
ninja
7272
ninja install
7373
- name: Compile BrainFlow MacOS
74-
if: (matrix.os == 'macos-11.0')
74+
if: (matrix.os == 'macos-12')
7575
run: |
7676
mkdir $GITHUB_WORKSPACE/build
7777
cd $GITHUB_WORKSPACE/build
@@ -94,8 +94,8 @@ jobs:
9494
# bindings in production have to use libraries compiled inside this image!
9595
if: (matrix.os == 'ubuntu-20.04')
9696
run: |
97-
docker pull dockcross/manylinux2014-x64:20210708-94745ff
98-
docker run -e BRAINFLOW_VERSION=$BRAINFLOW_VERSION -e GITHUB_WORKSPACE=$GITHUB_WORKSPACE -v $GITHUB_WORKSPACE:$GITHUB_WORKSPACE dockcross/manylinux2014-x64:20210708-94745ff /bin/bash -c "yum install -y bluez-libs-devel dbus-devel && /opt/python/cp36-cp36m/bin/pip3.6 install cmake==3.21.4 && cd $GITHUB_WORKSPACE && mkdir build_docker && cd build_docker && /opt/_internal/cpython-3.6.14/bin/cmake -DBRAINFLOW_VERSION=$BRAINFLOW_VERSION -DBUILD_ONNX=ON -DBUILD_BLE=ON -DBUILD_BLUETOOTH=ON -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/installed_docker -DCMAKE_BUILD_TYPE=Release .. && make && make install"
97+
docker pull dockcross/manylinux_2_28-x64:20240418-88c04a4
98+
docker run -e BRAINFLOW_VERSION=$BRAINFLOW_VERSION -e GITHUB_WORKSPACE=$GITHUB_WORKSPACE -v $GITHUB_WORKSPACE:$GITHUB_WORKSPACE dockcross/manylinux_2_28-x64:20240418-88c04a4 /bin/bash -c "yum install -y bluez-libs-devel dbus-devel && /opt/python/cp36-cp36m/bin/pip3.6 install cmake==3.21.4 && cd $GITHUB_WORKSPACE && mkdir build_docker && cd build_docker && /opt/_internal/cpython-3.6.15/bin/cmake -DBRAINFLOW_VERSION=$BRAINFLOW_VERSION -DBUILD_ONNX=ON -DBUILD_BLE=ON -DBUILD_BLUETOOTH=ON -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/installed_docker -DCMAKE_BUILD_TYPE=Release .. && make && make install"
9999
env:
100100
BRAINFLOW_VERSION: ${{ steps.version.outputs.version }}
101101
- name: C# build
@@ -154,7 +154,7 @@ jobs:
154154
- name: Run unit tests
155155
run: $GITHUB_WORKSPACE/build/tests/brainflow_tests
156156
- name: Synthetic C# Test MacOS
157-
if: (matrix.os == 'macos-11.0')
157+
if: (matrix.os == 'macos-12')
158158
run: |
159159
cd $GITHUB_WORKSPACE/csharp_package/brainflow/examples/brainflow_get_data/bin/Release/net7.0
160160
cp $GITHUB_WORKSPACE/installed/lib/libBoardController.dylib $GITHUB_WORKSPACE/csharp_package/brainflow/examples/brainflow_get_data/bin/Release/net7.0/
@@ -164,7 +164,7 @@ jobs:
164164
LD_LIBRARY_PATH: ${{ github.workspace }}/installed/lib
165165
DYLD_LIBRARY_PATH: ${{ github.workspace }}/installed/lib
166166
- name: EEG Metrics C# Test MacOS
167-
if: (matrix.os == 'macos-11.0')
167+
if: (matrix.os == 'macos-12')
168168
run: |
169169
cd $GITHUB_WORKSPACE/csharp_package/brainflow/examples/eeg_metrics/bin/Release/net7.0
170170
cp $GITHUB_WORKSPACE/installed/lib/libBoardController.dylib $GITHUB_WORKSPACE/csharp_package/brainflow/examples/eeg_metrics/bin/Release/net7.0/
@@ -409,7 +409,7 @@ jobs:
409409
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
410410
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
411411
- name: Push Libraries MacOS Dev
412-
if: ${{ github.event_name == 'push' && matrix.os == 'macos-11.0' && github.repository == 'brainflow-dev/brainflow' }}
412+
if: ${{ github.event_name == 'push' && matrix.os == 'macos-12' && github.repository == 'brainflow-dev/brainflow' }}
413413
run: |
414414
aws s3 cp $GITHUB_WORKSPACE/installed/lib/ s3://brainflow/$GITHUB_SHA/macos_release --recursive
415415
env:

‎.github/workflows/test_release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
fail-fast: false
1717
max-parallel: 4
1818
matrix:
19-
os: [windows-2019]
19+
os: [windows-2022]
2020

2121
steps:
2222
# install dependencies
@@ -47,7 +47,7 @@ jobs:
4747
fail-fast: false
4848
max-parallel: 4
4949
matrix:
50-
os: [ubuntu-18.04, ubuntu-20.04, macos-10.15, macos-11.0]
50+
os: [ubuntu-20.04, macos-12]
5151

5252
steps:
5353
# install dependencies
@@ -58,7 +58,7 @@ jobs:
5858
with:
5959
version: 1.3.1
6060
- name: Install Python Dependencies
61-
if: (matrix.os == 'ubuntu-18.04') || (matrix.os == 'ubuntu-20.04')
61+
if: (matrix.os == 'ubuntu-20.04')
6262
run: |
6363
sudo -H apt-get update -y
6464
sudo -H apt-get install -y python3-setuptools python3-pygments

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ if (WARNINGS_AS_ERRORS)
3535
add_compile_options (/bigobj)
3636
endif (CMAKE_BUILD_TYPE EQUAL "DEBUG")
3737
else ()
38-
add_compile_options (-Werror -Wno-varargs)
38+
add_compile_options (-Werror -Wno-varargs -Wno-error=deprecated-declarations)
3939
endif ()
4040
endif (WARNINGS_AS_ERRORS)
4141

0 commit comments

Comments
 (0)