Skip to content
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.

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

Update CI to use Json dictionaries #2806

Merged
merged 6 commits into from
Aug 26, 2024

Conversation

Lex-ari
Copy link
Contributor

@Lex-ari Lex-ari commented Jul 16, 2024

Related Issue(s) nasa/fprime-gds#177
Has Unit Tests (y/n) y
Documentation Included (y/n) y

Change Description

Updates CI to use Json dictionaries instead of XML dictionaries.

This essentially replaces TopologyAppDictionary.xml to TopologyDictionary.json in the RPi Test and fputil ci test.
This also updates guides to use Json dictionaries.

Rationale

Updates since fprime-seqgen should use json dictionaries instead of xml for future versions of fprime.

Testing Recommendations

Ensure CI is still functional and correct and perhaps do additional testing on hardware.

cc @Joshua-Anderson @kevin-f-ortega

@Joshua-Anderson
Copy link
Contributor

Looks good! I don't think this will pass yet, since we haven't done a release of the GDS with json dict support yet. @thomas-bc does it possibly make sense to do a alpha release of the GDS so that the core fprime repository can swap over and start testing against JSON dictionaries?

@LeStarch
Copy link
Collaborator

@Joshua-Anderson yes, it does!

@LeStarch
Copy link
Collaborator

@Lex-ari I did the alpha releases, committed the bump to your branch, de-conflicted another conflict, and CI is rerunning. Hopefully, this will resolve the issue.

@Lex-ari
Copy link
Contributor Author

Lex-ari commented Jul 25, 2024

I think this also needs to be changed...

DICTIONARY_PATH: build-artifacts/raspberrypi/RPI/dict/RPITopologyAppDictionary.xml

Looking at the log, something is still expecting an XML header. I'm going to find it.

Copy link
Collaborator

@thomas-bc thomas-bc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, we haven't done a release and that's what's causing issues here. We have done an Alpha release but not a full one - the pip install doesn't catch the alpha release because the workflow has code pip install fprime-gds and not to install from requirements.txt

@LeStarch
Copy link
Collaborator

Fixed requirements. Will update CI GDS version.

@LeStarch
Copy link
Collaborator

Note: breakages are blocking on tutorial PRs. Well get those merged tomorrow and rerun.

@thomas-bc
Copy link
Collaborator

@LeStarch I had to make a change to install requirements.txt in the RPI workflows. Turns out it was using a version that's installed on the RPI hosts. Used to work fine, but broke here since we are switching to JSON dictionary and therefore need a newer release.

@LeStarch LeStarch merged commit 4476828 into nasa:devel Aug 26, 2024
48 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants