Try again

ouster-lidar · Aug 1, 2024 · fbcc0cf · fbcc0cf
1 parent 07fa3a7
commit fbcc0cf
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 22 deletions.
diff --git a/.github/workflows/ccpp.yaml b/.github/workflows/ccpp.yaml
@@ -63,7 +63,28 @@ jobs:
     - name: cmake build
       run: cmake --build build -j4
     - name: run tests
-      run: cd build/ && ctest -j4
+      run: cd build/ && ctest -j4 -C Release
+  windows-python-build:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: vcpkg build
+      uses: johnwason/vcpkg-action@v6
+      id: vcpkg
+      with:
+        pkgs: jsoncpp eigen3 curl libtins glfw3 glew spdlog libpng flatbuffers gtest
+        triplet: x64-windows
+        revision: 2024.04.26
+        token: ${{ github.token }}
+        github-binarycache: true
+    - name: install python-deps
+      run: pip3 install pytest pytest-xdist
+    - name: build python
+      run: cd python && python3 -m pip install -e .[test]
+      env:
+        OUSTER_SDK_CMAKE_ARGS: '-DCMAKE_TOOLCHAIN_FILE=D:/a/ouster_example/ouster_example/vcpkg/scripts/buildsystems/vcpkg.cmake'
+    - name: run tests
+      run: cd python/tests && pytest -n3
   mac-build:
     runs-on: macos-latest
     steps:

diff --git a/ouster_pcap/src/ip_reassembler.cpp b/ouster_pcap/src/ip_reassembler.cpp
@@ -29,31 +29,29 @@
 
 #include "ip_reassembler.h"
 
+#include <tins/arp.h>
 #include <tins/constants.h>
 #include <tins/detail/pdu_helpers.h>
-#include <tins/ip.h>
-
-#include <tins/ip.h>
+#include <tins/dot11/dot11_base.h>
+#include <tins/dot1q.h>
+#include <tins/eapol.h>
 #include <tins/ethernetII.h>
+#include <tins/icmp.h>
+#include <tins/icmpv6.h>
 #include <tins/ieee802_3.h>
-#include <tins/radiotap.h>
-#include <tins/dot11/dot11_base.h>
-#include <tins/ipv6.h>
-#include <tins/tcp.h>
-#include <tins/udp.h>
+#include <tins/ip.h>
 #include <tins/ipsec.h>
-#include <tins/icmp.h>
+#include <tins/ipv6.h>
 #include <tins/loopback.h>
-#include <tins/sll.h>
-#include <tins/ppi.h>
-#include <tins/icmpv6.h>
 #include <tins/mpls.h>
-#include <tins/arp.h>
-#include <tins/eapol.h>
-#include <tins/rawpdu.h>
-#include <tins/dot1q.h>
-#include <tins/pppoe.h>
 #include <tins/pdu_allocator.h>
+#include <tins/ppi.h>
+#include <tins/pppoe.h>
+#include <tins/radiotap.h>
+#include <tins/rawpdu.h>
+#include <tins/sll.h>
+#include <tins/tcp.h>
+#include <tins/udp.h>
 using std::make_pair;
 
 namespace Tins {
@@ -116,10 +114,9 @@ bool IPv4Stream2::is_complete() const {
     return fragments_.begin()->offset() == 0;
 }
 
-static Tins::PDU* pdu_from_flag2(Constants::IP::e flag,
-                         const uint8_t* buffer,
-                         uint32_t size,
-                         bool rawpdu_on_no_match = true) {
+static Tins::PDU* pdu_from_flag2(Constants::IP::e flag, const uint8_t* buffer,
+                                 uint32_t size,
+                                 bool rawpdu_on_no_match = true) {
     switch (flag) {
         case Constants::IP::PROTO_IPIP:
             return new Tins::IP(buffer, size);