From f74d528a7af2df1033bae5f4694c04f3f9381947 Mon Sep 17 00:00:00 2001 From: Reg Marr Date: Sun, 29 Sep 2024 19:18:45 -0400 Subject: [PATCH] Use custom fprime-gds install --- .dockerignore | 1 + .gitmodules | 3 +++ Dockerfile | 2 +- fprime | 2 +- fprime-gds | 1 + 5 files changed, 7 insertions(+), 2 deletions(-) create mode 160000 fprime-gds diff --git a/.dockerignore b/.dockerignore index 911dd38..ba5c5f2 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,6 @@ # Exclude the submodule since we'll use git to grab it or mount it in a container fprime +fprime-gds # Exclude large parts of .git, but keep essential files **/.git/objects/pack/ diff --git a/.gitmodules b/.gitmodules index 80fc592..387589a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "fprime"] path = fprime url = git@github.com:ReggieMarr/fprime.git +[submodule "fprime-gds"] + path = fprime-gds + url = git@github.com:nasa/fprime-gds.git diff --git a/Dockerfile b/Dockerfile index 4d0760a..55a9055 100644 --- a/Dockerfile +++ b/Dockerfile @@ -74,9 +74,9 @@ ENV PATH="/home/user/.local/bin:${PATH}" USER root RUN pip install setuptools setuptools_scm wheel pip fprime-tools && \ pip install -r $FSW_WDIR/fprime/requirements.txt && \ + pip install -e $FSW_WDIR/fprime-gds && \ pip install pytest debugpy pyinfra asyncio asyncssh gitpython python-dotenv - FROM fprime_src AS stars_base ENV TZ='America/Montreal' diff --git a/fprime b/fprime index e72ab37..780fceb 160000 --- a/fprime +++ b/fprime @@ -1 +1 @@ -Subproject commit e72ab3701c409b7d0c712781efd68721a3b4dbbb +Subproject commit 780fceb964b708a6a2579b2a9aa6e48aa2603091 diff --git a/fprime-gds b/fprime-gds new file mode 160000 index 0000000..c926d86 --- /dev/null +++ b/fprime-gds @@ -0,0 +1 @@ +Subproject commit c926d86c7097d4e528ab10e5f9670de0cc55eb1a