Skip to content

Commit fb41f39

Browse files
authored
Merge pull request #113 from badgerloop-software/cmake-updates
CMake Updates
2 parents 4d53389 + c08aad6 commit fb41f39

File tree

4 files changed

+5
-117
lines changed

4 files changed

+5
-117
lines changed

.github/workflows/CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ jobs:
1010
steps:
1111
- uses: actions/checkout@v1
1212
- name: test
13-
run: mkdir build && cd build && cmake .. && make
13+
run: ./deploy.sh

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ Module.symvers
5959
Mkfile.old
6060
dkms.conf
6161
out/
62+
build/
6263
### C++ ###
6364
# Prerequisites
6465

Makefile

Lines changed: 0 additions & 110 deletions
This file was deleted.

deploy.sh

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
#!/bin/bash
22

3-
sudo modprobe vcan
4-
./embedded/utils/setupCAN.sh
5-
make examples VIRTUAL=1
3+
mkdir build && cd build
4+
cmake ..
65
retVal=$?
76
if [ $retVal -ne 0 ]; then
87
exit 1
98
fi
10-
make VIRTUAL=1
9+
make
1110
retVal=$?
1211
if [ $retVal -ne 0 ]; then
1312
exit 1
1413
fi
15-
python3 ./embedded/examples/sims/rms.py &
16-
./out/tests/can_test
1714
exit 0

0 commit comments

Comments
 (0)