Skip to content

Commit 42c665f

Browse files
LeStarchthomas-bc
andauthored
Update project structure in cookiecutters CI (#3991)
* Update project structure * Fix sourcing path * fix paths --------- Co-authored-by: Thomas Boyer-Chammard <[email protected]>
1 parent 9ec8c55 commit 42c665f

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
set timeout 180
22
spawn fprime-bootstrap project
3-
expect -re {.*Project name.*}
3+
expect -re {.*Project repository name.*}
4+
send "my-project\r"
5+
expect -re {.*Project top-level namespace.*}
46
send "MyProject\r"
57
expect eof

.github/workflows/ext-cookiecutters-test.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,41 +73,43 @@ jobs:
7373
uses: actions/checkout@v4
7474
with:
7575
submodules: true
76-
path: ./MyProject/lib/fprime
76+
path: ./my-project/lib/fprime
7777
fetch-depth: 0
7878

7979
- name: "Update dependencies and install fprime-tools"
8080
run: |
81-
cd MyProject
81+
cd my-project
8282
. fprime-venv/bin/activate
83-
pip install -U -r ./lib/fprime/requirements.txt
83+
pip install -U -r ./requirements.txt
8484
pip install git+https://github.com/nasa/fprime-tools@${{ needs.get-tools-branch.outputs.target-branch }}
8585
8686
- name: "Version Check"
8787
run: |
88-
cd MyProject
88+
cd my-project
8989
. fprime-venv/bin/activate
9090
fprime-util version-check
9191
9292
- name: "Test Generate and Build Project"
9393
run: |
94-
cd MyProject
94+
cd my-project
9595
. fprime-venv/bin/activate
9696
fprime-util generate
9797
fprime-util build -j4
9898
9999
- name: "Test New Deployment and Build"
100100
run: |
101-
cd MyProject
101+
cd my-project
102102
. fprime-venv/bin/activate
103-
expect ./lib/fprime/.github/actions/cookiecutter-check/deployment.expect
103+
cd MyProject
104+
expect ../lib/fprime/.github/actions/cookiecutter-check/deployment.expect
104105
cd MyDeployment
105106
fprime-util build -j4
106107
107108
- name: "Test New Component and Build"
108109
run: |
109-
cd MyProject
110+
cd my-project
110111
. fprime-venv/bin/activate
111-
expect ./lib/fprime/.github/actions/cookiecutter-check/component.expect
112+
cd MyProject
113+
expect ../lib/fprime/.github/actions/cookiecutter-check/component.expect
112114
cd MyComponent
113115
fprime-util build -j4

0 commit comments

Comments
 (0)