Skip to content

Update project structure in cookiecutters CI #3991

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
thomas-bc merged 3 commits into from
Aug 27, 2025
Merged

Update project structure in cookiecutters CI #3991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee37c6c
Update project structure
LeStarch Aug 6, 2025
3a09a1c
Fix sourcing path
LeStarch Aug 6, 2025
8d56799
fix paths
thomas-bc Aug 11, 2025
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
4 changes: 3 additions & 1 deletion .github/actions/cookiecutter-check/bootstrap.expect
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
set timeout 180
spawn fprime-bootstrap project
expect -re {.*Project name.*}
expect -re {.*Project repository name.*}
send "my-project\r"
expect -re {.*Project top-level namespace.*}
send "MyProject\r"
expect eof
20 changes: 11 additions & 9 deletions .github/workflows/ext-cookiecutters-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,41 +73,43 @@ jobs:
uses: actions/checkout@v4
with:
submodules: true
path: ./MyProject/lib/fprime
path: ./my-project/lib/fprime
fetch-depth: 0

- name: "Update dependencies and install fprime-tools"
run: |
cd MyProject
cd my-project
. fprime-venv/bin/activate
pip install -U -r ./lib/fprime/requirements.txt
pip install -U -r ./requirements.txt
pip install git+https://github.com/nasa/fprime-tools@${{ needs.get-tools-branch.outputs.target-branch }}

- name: "Version Check"
run: |
cd MyProject
cd my-project
. fprime-venv/bin/activate
fprime-util version-check

- name: "Test Generate and Build Project"
run: |
cd MyProject
cd my-project
. fprime-venv/bin/activate
fprime-util generate
fprime-util build -j4

- name: "Test New Deployment and Build"
run: |
cd MyProject
cd my-project
. fprime-venv/bin/activate
expect ./lib/fprime/.github/actions/cookiecutter-check/deployment.expect
cd MyProject
expect ../lib/fprime/.github/actions/cookiecutter-check/deployment.expect
cd MyDeployment
fprime-util build -j4

- name: "Test New Component and Build"
run: |
cd MyProject
cd my-project
. fprime-venv/bin/activate
expect ./lib/fprime/.github/actions/cookiecutter-check/component.expect
cd MyProject
expect ../lib/fprime/.github/actions/cookiecutter-check/component.expect
cd MyComponent
fprime-util build -j4
Loading