From 01f7b6ca9d5dd1ef36a099ea57fe08329c64cd1b Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Wed, 13 Aug 2025 15:55:58 -0400 Subject: [PATCH 1/7] [tryspaceorg/tryspace-lab#14] Cleanup of Dockerfile.base and Makefile, initial CI.yml; --- .github/workflows/ci.yml | 42 ++++++++++++ Makefile | 141 ++++++++++++++++++++------------------- cfg/Dockerfile.base | 19 +++--- 3 files changed, 123 insertions(+), 79 deletions(-) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..d23d1ea --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,42 @@ +name: CI + +on: + pull_request: + branches: + - '**' + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + submodules: recursive + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: '3.x' + + - name: Install GNU Make + run: sudo apt-get update && sudo apt-get install -y make + + - name: Build Container + run: | + make container + + - name: Build SIM + run: | + make sim + + - name: Build FSW + run: | + make fsw + + - name: Build GSW + run: | + make gsw diff --git a/Makefile b/Makefile index 3595132..ec134f7 100644 --- a/Makefile +++ b/Makefile @@ -1,58 +1,33 @@ # Makefile for TrySpace Lab development -.PHONY: all build build-fsw build-gsw build-sim build-cli cfg cli clean container debug fsw gsw real-clean runtime sim start stop +.PHONY: build clean clean-cli clean-fsw clean-gsw clean-sim cfg cli container debug env fsw gsw help sim start stop uninstall +# Build image name export BUILD_IMAGE_NAME ?= tryspace-lab -# Commands -all: runtime - -env: - @if [ ! -f $(CURDIR)/cfg/.env ]; then \ - echo "Creating $(CURDIR)/cfg/.env with current user UID/GID..."; \ - mkdir -p $(CURDIR)/cfg; \ - echo "UID=$$(id -u)" > $(CURDIR)/cfg/.env; \ - echo "GID=$$(id -g)" >> $(CURDIR)/cfg/.env; \ - echo "Created $(CURDIR)/cfg/.env"; \ - fi - $(MAKE) cfg - -# Configure orchestrator (merges configs and updates active.yaml) using Docker -cfg: - @echo "[Makefile] Running orchestrator to merge configs in Docker..." - docker run --rm -v $(CURDIR):$(CURDIR) -w $(CURDIR)/cfg --user $(shell id -u):$(shell id -g) $(BUILD_IMAGE_NAME) python3 tryspace-orchestrator.py +# Common paths +CFG_DIR := $(CURDIR)/cfg +ENV_FILE := $(CFG_DIR)/.env +# Commands build: env - $(MAKE) build-sim - $(MAKE) build-gsw - $(MAKE) build-fsw - -build-cli: env - $(MAKE) container - @for dir in $(CURDIR)/comp/*/cli ; do \ - if [ -f "$$dir/Makefile" ]; then \ - $(MAKE) -C "$$dir" runtime; \ - fi; \ - done - cd $(CURDIR)/simulith && $(MAKE) director && $(MAKE) server - -build-fsw: - docker run --rm -it -v $(CURDIR):$(CURDIR) --name "tryspace_fsw_build" -w $(CURDIR)/fsw --user $(shell id -u):$(shell id -g) --sysctl fs.mqueue.msg_max=10000 --ulimit rtprio=99 --cap-add=sys_nice $(BUILD_IMAGE_NAME) make -j build-fsw - -build-gsw: - cd $(CURDIR)/gsw && $(MAKE) runtime - -build-sim: - docker run --rm -it -v $(CURDIR):$(CURDIR) --name "tryspace_sim_build" -w $(CURDIR)/simulith --user $(shell id -u):$(shell id -g) $(BUILD_IMAGE_NAME) make -j build-sim + $(MAKE) sim + $(MAKE) fsw + $(MAKE) gsw -debug: env - docker run --rm -it -v $(CURDIR):$(CURDIR) --name "tryspace_fsw_debug" -w $(CURDIR) --user $(shell id -u):$(shell id -g) --sysctl fs.mqueue.msg_max=10000 --ulimit rtprio=99 --cap-add=sys_nice $(BUILD_IMAGE_NAME) /bin/bash +cfg: container + docker run --rm -v $(CURDIR):$(CURDIR) -w $(CURDIR)/cfg --user $(shell id -u):$(shell id -g) $(BUILD_IMAGE_NAME) python3 tryspace-orchestrator.py clean: $(MAKE) stop - $(MAKE) clean-cli - $(MAKE) clean-fsw - $(MAKE) clean-gsw - $(MAKE) clean-sim + @if docker image inspect $(BUILD_IMAGE_NAME):latest >/dev/null 2>&1; then \ + $(MAKE) clean-cli; \ + $(MAKE) clean-fsw; \ + $(MAKE) clean-gsw; \ + $(MAKE) clean-sim; \ + else \ + echo "Docker image $(BUILD_IMAGE_NAME) does not exist. Skipping clean subcommands."; \ + fi + rm -f $(ENV_FILE) $(CFG_DIR)/active.yaml $(CFG_DIR)/build.yaml clean-cli: @for dir in $(CURDIR)/comp/*/cli ; do \ @@ -71,50 +46,76 @@ clean-sim: cd simulith && $(MAKE) clean cli: env - $(MAKE) build-cli + $(MAKE) container + @for dir in $(CURDIR)/comp/*/cli ; do \ + if [ -f "$$dir/Makefile" ]; then \ + $(MAKE) -C "$$dir" runtime; \ + fi; \ + done + cd $(CURDIR)/simulith && $(MAKE) director && $(MAKE) server docker compose -f ./cfg/cli-compose.yml up -container: +container: cfg/Dockerfile.base docker build -t $(BUILD_IMAGE_NAME) -f cfg/Dockerfile.base --build-arg USER_ID=$(shell id -u) --build-arg GROUP_ID=$(shell id -g) . +debug: env + docker run --rm -it -v $(CURDIR):$(CURDIR) --name "tryspace_fsw_debug" -w $(CURDIR) --user $(shell id -u):$(shell id -g) --sysctl fs.mqueue.msg_max=10000 --ulimit rtprio=99 --cap-add=sys_nice $(BUILD_IMAGE_NAME) /bin/bash + +env: + @command -v docker >/dev/null 2>&1 || { echo "Error: docker is not installed or not in PATH."; exit 1; } + @command -v python3 >/dev/null 2>&1 || { echo "Error: python3 is not installed or not in PATH."; exit 1; } + @if [ ! -f $(ENV_FILE) ]; then \ + echo "Creating $(ENV_FILE) with current user UID/GID..."; \ + mkdir -p $(CFG_DIR); \ + echo "UID=$$(id -u)" > $(ENV_FILE); \ + echo "GID=$$(id -g)" >> $(ENV_FILE); \ + echo "Created $(ENV_FILE)"; \ + fi + $(MAKE) cfg + fsw: env cd $(CURDIR)/fsw && $(MAKE) runtime gsw: env $(MAKE) build-gsw +help: + @echo "Usage: make " + @echo "Targets:" + @echo " build - Build the full runtime environment" + @echo " cfg - Run orchestrator to configure environment" + @echo " cli - Build CLI and start CLI services" + @echo " clean - Remove build artifacts and stop services" + @echo " clean-cli - Clean CLI components" + @echo " clean-fsw - Clean FSW components" + @echo " clean-gsw - Clean GSW components" + @echo " clean-sim - Clean simulation components" + @echo " container - Build the Docker container" + @echo " debug - Start a debug shell in the container" + @echo " env - Create .env file and check required tools" + @echo " fsw - Build FSW" + @echo " gsw - Build GSW" + @echo " sim - Build Simulith and component simulators" + @echo " start - Start lab services" + @echo " stop - Stop lab and CLI services, clean up Docker images" + @echo " uninstall - Remove containers, images, volumes, and networks" + sim: env cd $(CURDIR)/comp/demo/sim && $(MAKE) runtime cd $(CURDIR)/simulith && $(MAKE) director && $(MAKE) server -real-clean: clean - docker ps -a --filter "name=tryspace-" -q | xargs -r docker rm -f - docker images "tryspace-*" -q | xargs -r docker rmi - docker volume ls -q --filter "name=gsw-data" | xargs -r docker volume rm - docker volume ls -q --filter "name=simulith_ipc" | xargs -r docker volume rm - docker network ls -q --filter "name=tryspace-net" | xargs -r docker network rm - docker network ls -q --filter "name=cfg_tryspace-net" | xargs -r docker network rm - -runtime: env - $(MAKE) container - $(MAKE) sim - $(MAKE) fsw - $(MAKE) gsw - start: env docker compose -f ./cfg/lab-compose.yml up -start-fsw: - cd fsw && $(MAKE) start - -start-gsw: - cd gsw && $(MAKE) start - -start-sim: - cd simulith && $(MAKE) start - stop: docker compose -f ./cfg/cli-compose.yml down docker compose -f ./cfg/lab-compose.yml down docker images -f "dangling=true" -q | xargs -r docker rmi +uninstall: clean + docker ps -a --filter "name=tryspace-" -q | xargs -r docker rm -f + docker images "tryspace-*" -q | xargs -r docker rmi + docker volume ls -q --filter "name=gsw-data" | xargs -r docker volume rm + docker volume ls -q --filter "name=simulith_ipc" | xargs -r docker volume rm + docker network ls -q --filter "name=tryspace-net" | xargs -r docker network rm + docker network ls -q --filter "name=cfg_tryspace-net" | xargs -r docker network rm diff --git a/cfg/Dockerfile.base b/cfg/Dockerfile.base index 9b5a1d3..5bc5f46 100644 --- a/cfg/Dockerfile.base +++ b/cfg/Dockerfile.base @@ -7,24 +7,25 @@ # FROM debian:bookworm-slim@sha256:6ac2c08566499cc2415926653cf2ed7c3aedac445675a013cc09469c9e118fdd +ENV DEBIAN_FRONTEND=noninteractive LABEL maintainer="TrySpaceOrg" description="Base image for TrySpace Lab" # Install required tools RUN apt-get update && \ apt-get install -y --no-install-recommends \ - build-essential=12.9 \ - cmake=3.25.1-1 \ - git=1:2.39.5-0+deb12u2 \ - libsocketcan-dev=0.0.12-1 \ - libzmq3-dev=4.3.4-6 \ - pkg-config=1.8.1-1 \ - python3=3.11.2-1+b1 \ - python3-pip=23.0.1+dfsg-1 \ + build-essential \ + cmake \ + git \ + libsocketcan-dev \ + libzmq3-dev \ + pkg-config \ + python3 \ + python3-pip \ && apt-get clean && rm -rf /var/lib/apt/lists/* # Install orchestrator requirements for python COPY cfg/requirements.txt /requirements.txt -RUN pip3 install --break-system-packages --no-cache-dir -r /requirements.txt +RUN pip3 install --break-system-packages --no-cache-dir --upgrade -r /requirements.txt && pip cache purge # Create user for development (matches host user) ARG USER_ID=1000 From 899291e1b3a1545254524f4423287429fe088a22 Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Thu, 14 Aug 2025 11:19:01 -0400 Subject: [PATCH 2/7] [tryspaceorg/tryspace-lab#14] Updates to use public container and cleanup make/cmake; --- .github/workflows/ci.yml | 24 ++++++++++++++++++++++-- Makefile | 30 ++++++++++++++++++++++-------- cfg/Dockerfile.base | 4 ++-- comp/demo | 2 +- fsw | 2 +- gsw | 2 +- simulith | 2 +- 7 files changed, 50 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d23d1ea..3273ec7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: - '**' jobs: - build: + setup: runs-on: ubuntu-latest steps: - name: Checkout repository @@ -29,14 +29,34 @@ jobs: run: | make container - - name: Build SIM + build-simulith: + needs: setup + runs-on: ubuntu-latest + steps: + - name: Build Simulith run: | make sim + build-fsw: + needs: setup + runs-on: ubuntu-latest + steps: - name: Build FSW run: | make fsw + build-gsw: + needs: setup + runs-on: ubuntu-latest + steps: - name: Build GSW run: | make gsw + + build-cli: + needs: setup + runs-on: ubuntu-latest + steps: + - name: Build CLI + run: | + make cli diff --git a/Makefile b/Makefile index ec134f7..5026d6d 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ .PHONY: build clean clean-cli clean-fsw clean-gsw clean-sim cfg cli container debug env fsw gsw help sim start stop uninstall # Build image name -export BUILD_IMAGE_NAME ?= tryspace-lab +export BUILD_IMAGE ?= tryspaceorg/tryspace-lab # Common paths CFG_DIR := $(CURDIR)/cfg @@ -15,17 +15,17 @@ build: env $(MAKE) gsw cfg: container - docker run --rm -v $(CURDIR):$(CURDIR) -w $(CURDIR)/cfg --user $(shell id -u):$(shell id -g) $(BUILD_IMAGE_NAME) python3 tryspace-orchestrator.py + docker run --rm -v $(CURDIR):$(CURDIR) -w $(CURDIR)/cfg --user $(shell id -u):$(shell id -g) $(BUILD_IMAGE) python3 tryspace-orchestrator.py clean: $(MAKE) stop - @if docker image inspect $(BUILD_IMAGE_NAME):latest >/dev/null 2>&1; then \ + @if docker image inspect $(BUILD_IMAGE):latest >/dev/null 2>&1; then \ $(MAKE) clean-cli; \ $(MAKE) clean-fsw; \ $(MAKE) clean-gsw; \ $(MAKE) clean-sim; \ else \ - echo "Docker image $(BUILD_IMAGE_NAME) does not exist. Skipping clean subcommands."; \ + echo "Docker image $(BUILD_IMAGE) does not exist. Skipping clean subcommands."; \ fi rm -f $(ENV_FILE) $(CFG_DIR)/active.yaml $(CFG_DIR)/build.yaml @@ -43,6 +43,11 @@ clean-gsw: cd gsw && $(MAKE) clean clean-sim: + @for dir in $(CURDIR)/comp/* ; do \ + if [ -d "$$dir" ] && [ -f "$$dir/Makefile" ]; then \ + $(MAKE) -C "$$dir" clean; \ + fi; \ + done cd simulith && $(MAKE) clean cli: env @@ -56,10 +61,10 @@ cli: env docker compose -f ./cfg/cli-compose.yml up container: cfg/Dockerfile.base - docker build -t $(BUILD_IMAGE_NAME) -f cfg/Dockerfile.base --build-arg USER_ID=$(shell id -u) --build-arg GROUP_ID=$(shell id -g) . + docker build -t $(BUILD_IMAGE) -f cfg/Dockerfile.base --build-arg USER_ID=$(shell id -u) --build-arg GROUP_ID=$(shell id -g) . debug: env - docker run --rm -it -v $(CURDIR):$(CURDIR) --name "tryspace_fsw_debug" -w $(CURDIR) --user $(shell id -u):$(shell id -g) --sysctl fs.mqueue.msg_max=10000 --ulimit rtprio=99 --cap-add=sys_nice $(BUILD_IMAGE_NAME) /bin/bash + docker run --rm -it -v $(CURDIR):$(CURDIR) --name "tryspace_fsw_debug" -w $(CURDIR) --user $(shell id -u):$(shell id -g) --sysctl fs.mqueue.msg_max=10000 --ulimit rtprio=99 --cap-add=sys_nice $(BUILD_IMAGE) /bin/bash env: @command -v docker >/dev/null 2>&1 || { echo "Error: docker is not installed or not in PATH."; exit 1; } @@ -77,7 +82,7 @@ fsw: env cd $(CURDIR)/fsw && $(MAKE) runtime gsw: env - $(MAKE) build-gsw + cd $(CURDIR)/gsw && $(MAKE) runtime help: @echo "Usage: make " @@ -101,7 +106,12 @@ help: @echo " uninstall - Remove containers, images, volumes, and networks" sim: env - cd $(CURDIR)/comp/demo/sim && $(MAKE) runtime + @for dir in $(CURDIR)/comp/*/sim ; do \ + if [ -d "$$dir" ] && [ -f "$$dir/Makefile" ]; then \ + echo "Building component in $$dir"; \ + $(MAKE) -C "$$dir" runtime; \ + fi; \ + done cd $(CURDIR)/simulith && $(MAKE) director && $(MAKE) server start: env @@ -119,3 +129,7 @@ uninstall: clean docker volume ls -q --filter "name=simulith_ipc" | xargs -r docker volume rm docker network ls -q --filter "name=tryspace-net" | xargs -r docker network rm docker network ls -q --filter "name=cfg_tryspace-net" | xargs -r docker network rm + @echo "" + @echo "To remove everything docker run: " + @echo " docker system prune -a" + @echo "" diff --git a/cfg/Dockerfile.base b/cfg/Dockerfile.base index 5bc5f46..98a8142 100644 --- a/cfg/Dockerfile.base +++ b/cfg/Dockerfile.base @@ -2,8 +2,8 @@ # https://github.com/TrySpaceOrg/tryspace-lab # # Assumes build using `make container` from top level of tryspace-lab repository -# -# docker push ghcr.io/tryspaceorg/tryspace-lab:latest +# +# docker push tryspaceorg/tryspace-lab: # FROM debian:bookworm-slim@sha256:6ac2c08566499cc2415926653cf2ed7c3aedac445675a013cc09469c9e118fdd diff --git a/comp/demo b/comp/demo index b7cb6b5..004233a 160000 --- a/comp/demo +++ b/comp/demo @@ -1 +1 @@ -Subproject commit b7cb6b565225138f939ad3b53d337d27f2545faa +Subproject commit 004233a3b3b1232722ff2eee6dda88589287c22b diff --git a/fsw b/fsw index c7ba41f..5f8c994 160000 --- a/fsw +++ b/fsw @@ -1 +1 @@ -Subproject commit c7ba41f1e5d676c6658580f9f6fb4d11a8c886a0 +Subproject commit 5f8c9945842353248dba2f93ed53d559cba30695 diff --git a/gsw b/gsw index b1edc4e..1b70040 160000 --- a/gsw +++ b/gsw @@ -1 +1 @@ -Subproject commit b1edc4edb87171ecb27fa45b01e215e891dfde11 +Subproject commit 1b70040f0d822177b211928b968b1a1a5bf4d0f8 diff --git a/simulith b/simulith index 0ed4901..97b88f0 160000 --- a/simulith +++ b/simulith @@ -1 +1 @@ -Subproject commit 0ed490157ea09a8086a4ebdb239ad26f3fd00390 +Subproject commit 97b88f0259162676942d9182354d72b759d3a74b From ae69cd7156a6389b507cbc45690a6260bd49324a Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Thu, 14 Aug 2025 11:59:28 -0400 Subject: [PATCH 3/7] [tryspaceorg/tryspace-lab#14] Use public container in ci.yml; --- .github/workflows/ci.yml | 53 ++++++++++------------------------------ Makefile | 1 - simulith | 2 +- 3 files changed, 14 insertions(+), 42 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3273ec7..f39f66a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,57 +6,30 @@ on: - '**' jobs: - setup: + build-simulith: runs-on: ubuntu-latest + container: + image: tryspaceorg/tryspace-lab steps: - name: Checkout repository uses: actions/checkout@v4 with: submodules: recursive - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: '3.x' - - - name: Install GNU Make - run: sudo apt-get update && sudo apt-get install -y make - - - name: Build Container - run: | - make container - - build-simulith: - needs: setup - runs-on: ubuntu-latest - steps: + fetch-depth: 1 - name: Build Simulith run: | - make sim + cd simulith && make build-sim build-fsw: - needs: setup runs-on: ubuntu-latest + container: + image: tryspaceorg/tryspace-lab steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 1 - name: Build FSW run: | - make fsw - - build-gsw: - needs: setup - runs-on: ubuntu-latest - steps: - - name: Build GSW - run: | - make gsw - - build-cli: - needs: setup - runs-on: ubuntu-latest - steps: - - name: Build CLI - run: | - make cli + cd fsw && make build-fsw diff --git a/Makefile b/Makefile index 5026d6d..4a98e66 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,6 @@ debug: env env: @command -v docker >/dev/null 2>&1 || { echo "Error: docker is not installed or not in PATH."; exit 1; } - @command -v python3 >/dev/null 2>&1 || { echo "Error: python3 is not installed or not in PATH."; exit 1; } @if [ ! -f $(ENV_FILE) ]; then \ echo "Creating $(ENV_FILE) with current user UID/GID..."; \ mkdir -p $(CFG_DIR); \ diff --git a/simulith b/simulith index 97b88f0..796e1a2 160000 --- a/simulith +++ b/simulith @@ -1 +1 @@ -Subproject commit 97b88f0259162676942d9182354d72b759d3a74b +Subproject commit 796e1a2c29cfd9dc1510cfe3c859e0063226573d From d6b00be48f9c07856028e36f6d79baf41b87b17d Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Thu, 14 Aug 2025 12:07:25 -0400 Subject: [PATCH 4/7] [tryspaceorg/tryspace-lab#14] Attempt to build component sims and added orchestrator step to FSW CI; --- .github/workflows/ci.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f39f66a..f193245 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,6 +18,12 @@ jobs: fetch-depth: 1 - name: Build Simulith run: | + for dir in $(pwd)/comp/*/sim ; do \ + if [ -d "$dir" ] && [ -f "$dir/Makefile" ]; then \ + echo "Building component in $dir" \ + make -C "$dir" build-sim \ + fi \ + done \ cd simulith && make build-sim build-fsw: @@ -32,4 +38,4 @@ jobs: fetch-depth: 1 - name: Build FSW run: | - cd fsw && make build-fsw + cd cfg && python3 tryspace-orchestrator.py && cd ../fsw && make build-fsw From 20c2e8294223f599baab60d781ae9253a86e6475 Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Thu, 14 Aug 2025 12:12:47 -0400 Subject: [PATCH 5/7] [tryspaceorg/tryspace-lab#14] Updated ci.yml formatting; --- .github/workflows/ci.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f193245..729546d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,13 +18,14 @@ jobs: fetch-depth: 1 - name: Build Simulith run: | - for dir in $(pwd)/comp/*/sim ; do \ - if [ -d "$dir" ] && [ -f "$dir/Makefile" ]; then \ - echo "Building component in $dir" \ - make -C "$dir" build-sim \ - fi \ - done \ - cd simulith && make build-sim + for dir in $(pwd)/comp/*/sim ; do + if [ -d "$dir" ] && [ -f "$dir/Makefile" ]; then + echo "Building component in $dir" + make -C "$dir" build-sim + fi + done + cd simulith + make build-sim build-fsw: runs-on: ubuntu-latest @@ -38,4 +39,7 @@ jobs: fetch-depth: 1 - name: Build FSW run: | - cd cfg && python3 tryspace-orchestrator.py && cd ../fsw && make build-fsw + cd cfg + python3 tryspace-orchestrator.py + cd ../fsw + make build-fsw From 51173e79b5bd2ac2a00e44ced358026bcab27f2a Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Thu, 14 Aug 2025 12:15:30 -0400 Subject: [PATCH 6/7] [tryspaceorg/tryspace-lab#14] Added cfg step to build-simulith; --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 729546d..2f80404 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,6 +18,9 @@ jobs: fetch-depth: 1 - name: Build Simulith run: | + cd cfg + python3 tryspace-orchestrator.py + cd .. for dir in $(pwd)/comp/*/sim ; do if [ -d "$dir" ] && [ -f "$dir/Makefile" ]; then echo "Building component in $dir" From e19020e3aae0f32771e14401d81aaa64e6b5d57c Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Thu, 14 Aug 2025 13:10:15 -0400 Subject: [PATCH 7/7] [tryspaceorg/tryspace-lab#14] Updates after submodule merges; --- comp/demo | 2 +- fsw | 2 +- gsw | 2 +- simulith | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/comp/demo b/comp/demo index 004233a..bd81a9b 160000 --- a/comp/demo +++ b/comp/demo @@ -1 +1 @@ -Subproject commit 004233a3b3b1232722ff2eee6dda88589287c22b +Subproject commit bd81a9bc096217eb5e0dab46d60be2d460690720 diff --git a/fsw b/fsw index 5f8c994..8e08c2c 160000 --- a/fsw +++ b/fsw @@ -1 +1 @@ -Subproject commit 5f8c9945842353248dba2f93ed53d559cba30695 +Subproject commit 8e08c2c677530a8068812b40a74364a388215db9 diff --git a/gsw b/gsw index 1b70040..361dda0 160000 --- a/gsw +++ b/gsw @@ -1 +1 @@ -Subproject commit 1b70040f0d822177b211928b968b1a1a5bf4d0f8 +Subproject commit 361dda0cf45cf402a5230f81f0cf39fbf76d373c diff --git a/simulith b/simulith index 796e1a2..15b5dd9 160000 --- a/simulith +++ b/simulith @@ -1 +1 @@ -Subproject commit 796e1a2c29cfd9dc1510cfe3c859e0063226573d +Subproject commit 15b5dd911bd24bd55c003b9ffa567c17d0040564