Skip to content

[#71] Updates to submodules after merges; #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jlucas9 merged 1 commit into from
Sep 25, 2025
Merged

[#71] Updates to submodules after merges; #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
build-simulith:
runs-on: ubuntu-latest
container:
image: tryspaceorg/tryspace-lab:0.0.1
image: tryspaceorg/tryspace-lab:1.0.0
steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand All @@ -36,7 +36,7 @@ jobs:
build-fsw:
runs-on: ubuntu-latest
container:
image: tryspaceorg/tryspace-lab:0.0.1
image: tryspaceorg/tryspace-lab:1.0.0
steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand All @@ -55,7 +55,7 @@ jobs:
build-test:
runs-on: ubuntu-latest
container:
image: tryspaceorg/tryspace-lab:0.0.1
image: tryspaceorg/tryspace-lab:1.0.0
steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand All @@ -79,7 +79,7 @@ jobs:
build-cli:
runs-on: ubuntu-latest
container:
image: tryspaceorg/tryspace-lab:0.0.1
image: tryspaceorg/tryspace-lab:1.0.0
steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand Down
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.PHONY: build clean clean-cache clean-cli clean-fsw clean-gsw clean-sim cfg cli cli-start container debug fsw gsw help mold sim start stop uninstall

# Build image name
export BUILD_IMAGE ?= tryspaceorg/tryspace-lab:0.0.1
export BUILD_IMAGE ?= tryspaceorg/tryspace-lab:1.0.0

# Common paths
CFG_DIR := $(CURDIR)/cfg
Expand Down Expand Up @@ -149,8 +149,8 @@ stop:
uninstall: clean clean-cache
rm -f $(CFG_DIR)/active.yaml $(CFG_DIR)/build.yaml
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 images "tryspace-*" -q | xargs -r docker rmi -f
docker volume ls -q --filter "name=gsw-data" | xargs -r docker volume rm -f
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
Expand Down
2 changes: 1 addition & 1 deletion atlas
Open in desktop
Submodule atlas updated 0 files
2 changes: 1 addition & 1 deletion cfg/Dockerfile.base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# Assumes build using `make container` from top level of tryspace-lab repository
#
# docker push tryspaceorg/tryspace-lab:0.0.1
# docker push tryspaceorg/tryspace-lab:1.0.0
#

FROM debian:bookworm-slim@sha256:6ac2c08566499cc2415926653cf2ed7c3aedac445675a013cc09469c9e118fdd
Expand Down
2 changes: 1 addition & 1 deletion comp/adcs
Open in desktop
Submodule adcs updated 3 files
+1 −1 cli/Makefile
+1 −1 sim/Makefile
+1 −1 support/Dockerfile.cli
2 changes: 1 addition & 1 deletion comp/cryptolib
Open in desktop
Submodule cryptolib updated 2 files
+1 −1 Makefile
+1 −1 support/Dockerfile.standalone
2 changes: 1 addition & 1 deletion comp/demo
Open in desktop
Submodule demo updated 3 files
+1 −1 cli/Makefile
+1 −1 sim/Makefile
+1 −1 support/Dockerfile.cli
2 changes: 1 addition & 1 deletion comp/eps
Open in desktop
Submodule eps updated 3 files
+1 −1 cli/Makefile
+1 −1 sim/Makefile
+1 −1 support/Dockerfile.cli
2 changes: 1 addition & 1 deletion comp/radio
Open in desktop
Submodule radio updated 3 files
+1 −1 cli/Makefile
+1 −1 sim/Makefile
+1 −1 support/Dockerfile.cli
2 changes: 1 addition & 1 deletion fsw
Open in desktop
Submodule fsw updated 11 files
+7 −1 Makefile
+1 −1 apps/ds
+1 −1 apps/hwlib
+1 −1 apps/io_lib
+1 −1 apps/lc
+1 −1 apps/sc
+1 −1 apps/sch
+1 −1 apps/to_lab
+1 −1 osal
+1 −1 psp
+3 −10 tools/Dockerfile.fsw
2 changes: 1 addition & 1 deletion gsw
Open in desktop
Submodule gsw updated 1 files
+3 −3 Makefile
2 changes: 1 addition & 1 deletion simulith
Open in desktop
Submodule simulith updated 4 files
+2 −2 .github/workflows/ci.yml
+1 −1 Makefile
+1 −1 docker/Dockerfile.director
+1 −1 docker/Dockerfile.server