Merge pull request #9 from geonnave/configure-build-via-env-var

Configure builds from env var

.github/workflows/main.yml

@@ -136,4 +136,8 @@ jobs:
 
       - name: Build ${{ matrix.target }}
         run: |
-          BUILD_CONFIG=debug swarmake build ${{ matrix.target }}
+          if [ "${{ matrix.target }}" == "dotbot" ]; then
+            BUILD_CONFIG=debug TARGET_APP=move swarmake build ${{ matrix.target }}
+          else
+            BUILD_CONFIG=debug swarmake build ${{ matrix.target }}
+          fi

README.md

@@ -37,7 +37,7 @@ swarmake run lakers
 ## Deploy
 Deploy a Swarm of DotBots:
 ```bash
-swarmake deploy move --monitor
+TARGET_APP=move swarmake deploy --monitor
 ```
 
 The command above will:

swarmake/main.py

@@ -130,11 +130,9 @@ def list():
 
 @main.command()
 @click.option('-m', '--monitor', default=False, is_flag=True, help="Tell swarmit to monitor the event logs right after the experiment starts")
-@click.argument("firmware_name")
-def deploy(firmware_name, monitor):
+def deploy(monitor):
     """Deploy a firmware to a set of DotBots."""
     dotbot_project = load_project_config("dotbot")
-    swarmit_project = load_project_config("swarmit")
 
     # if needed, build dotbot and swarmit projects
     res = cmd.execute(dotbot_project.list_outputs_cmd, directory=dotbot_project.build_dir)
@@ -153,7 +151,10 @@ def deploy(firmware_name, monitor):
 
     # deploy the firmware to the devices using swarmit
     res = cmd.execute("swarmit stop") # make sure experiment is not running
-    time.sleep(1)
+    if not res:
+        logging.warning("Failed to stop the experiment")
+        return
+    time.sleep(2)
     res = cmd.execute_pretty(f"swarmit flash -y $PWD/build/dotbot/{dotbot_project.output_dir}/*.bin")
     time.sleep(1)
     if not res:

swarmake/swarmake.toml

@@ -1,13 +1,9 @@
 
 [projects.dotbot]
 repo = "DotBot-firmware" # if the project name is different from the repo name
-build = """
-BUILD_TARGET=dotbot-v2 BUILD_CONFIG=Debug DOCKER_TARGETS="swarmit_motors" make docker
-"""
-list-outputs = """
-ls -l swarmit/motors/Output/dotbot-v2/Debug/Exe
-"""
-output-dir = "swarmit/motors/Output/dotbot-v2/Debug/Exe"
+build = "BUILD_TARGET=dotbot-v2 BUILD_CONFIG=Debug DOCKER_TARGETS=swarmit_$TARGET_APP make docker"
+list-outputs = "ls -l swarmit/$TARGET_APP/Output/dotbot-v2/Debug/Exe"
+output-dir = "swarmit/$TARGET_APP/Output/dotbot-v2/Debug/Exe"
 
 [projects.pydotbot]
 repo = "PyDotBot"