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

Fix #149, update cmake recipe #150

Merged
merged 1 commit into from
Apr 12, 2023
Merged

Conversation

jphickey
Copy link
Contributor

@jphickey jphickey commented Apr 6, 2023

Describe the contribution
Prefer target-scope properties over directory scope where applicable

Fixes #149

Testing performed
Build and run, sanity check

Expected behavior changes
No impact

System(s) tested on
Debian

Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.

@jphickey jphickey added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Apr 6, 2023
@jphickey jphickey force-pushed the fix-109-cmake-recipe branch from 522fac3 to 20b7fb6 Compare April 6, 2023 16:13
@dzbaker dzbaker added CCB:Provisionally-Approved and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Apr 6, 2023
@jphickey
Copy link
Contributor Author

jphickey commented Apr 7, 2023

I think you want:

* [Update cmake script to use current best practices #149](https://github.com/nasa/to_lab/issues/149)
  not:

* [Workflows overly restrictive run, missing duplicate check, format job name incorrect, remove --quiet from cppcheck #109](https://github.com/nasa/to_lab/issues/109)

Thanks @skliper - was in too much of a hurry to get some PRs submitted yesterday.

@jphickey jphickey changed the title Fix #109, update cmake recipe Fix #149, update cmake recipe Apr 7, 2023
Prefer target-scope properties over directory scope where applicable
@jphickey jphickey force-pushed the fix-109-cmake-recipe branch from 20b7fb6 to f908518 Compare April 7, 2023 12:45
@jphickey
Copy link
Contributor Author

jphickey commented Apr 7, 2023

@dzbaker This one should be OK now. I found an issue of an errant line I had put in to test something and removed it, now the workflow failure that I see is related to #include "ci_lab_msgids.h" ... which is what I expect to see until e.g. nasa/ci_lab#136 (and the others) are also merged.

I'd recommend merging all 4 cmake updates into "integration-candidate" and running the workflow there, it should go cleanly.

@dzbaker dzbaker added CCB:Approved Indicates approval by CCB and removed CCB:Provisionally-Approved labels Apr 10, 2023
dzbaker added a commit to nasa/cFS that referenced this pull request Apr 10, 2023
*Combines:*

PSP v1.6.0-rc4+dev71
ci_lab v2.5.0-rc4+dev43
sample_app v1.3.0-rc4+dev39
sch_lab v2.5.0-rc4+dev49
to_lab v2.5.0-rc4+dev41

**Includes:**

*PSP*
- nasa/PSP#389

*ci_lab*
- nasa/ci_lab#136

*sample_app*
- nasa/sample_app#203

*sch_lab*
- nasa/sch_lab#136

*to_lab*
- nasa/to_lab#150

Co-authored by: Joseph Hickey <[email protected]>
@dzbaker dzbaker mentioned this pull request Apr 10, 2023
2 tasks
dzbaker added a commit to nasa/cFS that referenced this pull request Apr 12, 2023
*Combines:*

PSP v1.6.0-rc4+dev71
ci_lab v2.5.0-rc4+dev43
sample_app v1.3.0-rc4+dev39
sch_lab v2.5.0-rc4+dev49
to_lab v2.5.0-rc4+dev41

**Includes:**

*PSP*
- nasa/PSP#389

*ci_lab*
- nasa/ci_lab#136

*sample_app*
- nasa/sample_app#203

*sch_lab*
- nasa/sch_lab#136

*to_lab*
- nasa/to_lab#150

Co-authored by: Joseph Hickey <[email protected]>
@dzbaker dzbaker merged commit ed7b4a5 into nasa:main Apr 12, 2023
dzbaker added a commit to nasa/cFS that referenced this pull request Apr 12, 2023
*Combines:*

PSP v1.6.0-rc4+dev71
ci_lab v2.5.0-rc4+dev43
sample_app v1.3.0-rc4+dev39
sch_lab v2.5.0-rc4+dev49
to_lab v2.5.0-rc4+dev41

**Includes:**

*PSP*
- nasa/PSP#389

*ci_lab*
- nasa/ci_lab#136

*sample_app*
- nasa/sample_app#203

*sch_lab*
- nasa/sch_lab#136

*to_lab*
- nasa/to_lab#150

Co-authored by: Joseph Hickey <[email protected]>
@jphickey jphickey deleted the fix-109-cmake-recipe branch November 16, 2023 14:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CCB:Approved Indicates approval by CCB
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update cmake script to use current best practices
3 participants