Merge branch 'master' into run-sim

Test simulator run in CI
2026-01-09 12:36:49 +00:00 · 2024-05-24 22:35:36 +03:00 · 2024-01-31 17:23:07 +03:00 · 2024-01-25 23:53:08 +03:00
2 changed files with 8 additions and 1 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -48,6 +48,8 @@ jobs:
      run: sudo apt-get install libsdl2-dev
    - name: Build simulator
      run: make build_simulator
+    - name: Run simulator
+      run: timeout --preserve-status 30 make simulator GAZEBO=gzserver || [ $? -eq 143 ]
    - uses: actions/upload-artifact@v3
      with:
        name: gazebo-plugin-binary
@@ -73,3 +75,7 @@ jobs:
      run: brew install sdl2
    - name: Build simulator
      run: make build_simulator
+    - name: Run simulator
+      run: |
+        brew install coreutils
+        timeout --preserve-status 30 make simulator GAZEBO=gzserver || [ $? -eq 143 ]
--- a/3
+++ b/3
@@ -26,10 +26,11 @@ gazebo/build cmake: gazebo/CMakeLists.txt
 build_simulator: .dependencies gazebo/build
 	make -C gazebo/build

+GAZEBO ?= gazebo
 simulator: build_simulator
 	GAZEBO_MODEL_PATH=$$GAZEBO_MODEL_PATH:${CURDIR}/gazebo/models \
 	GAZEBO_PLUGIN_PATH=$$GAZEBO_PLUGIN_PATH:${CURDIR}/gazebo/build \
-	gazebo --verbose ${CURDIR}/gazebo/flix.world
+	$(GAZEBO) --verbose ${CURDIR}/gazebo/flix.world

 log:
 	PORT=$(PORT) tools/grab_log.py
Author	SHA1	Message	Date
Oleg Kalachev	d0eb2dd9ba	Merge branch 'master' into run-sim	2024-05-24 22:35:36 +03:00
Oleg Kalachev	44ed3cf42c	Merge branch 'master' into run-sim	2024-01-31 17:23:07 +03:00
Oleg Kalachev	aa02e6344b	Test simulator run in CI	2024-01-25 23:53:08 +03:00