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

Add CI on release branches #2417

Merged
merged 4 commits into from
Dec 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/autodoc.bash
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ cd "$GITHUB_WORKSPACE"
REMOTE="${1:-origin}"
git config --local user.email "nasa-fprime[bot]@users.noreply.github.com"
git config --local user.name "nasa-fprime[bot]"
git fetch "${REMOTE}" release/documentation
git fetch "${REMOTE}" docs/auto-documentation
git fetch "${REMOTE}" devel
git checkout release/documentation
git checkout docs/auto-documentation
GIT_EDITOR=true git merge "${REMOTE}"/devel
${GITHUB_WORKSPACE}/docs/doxygen/generate_docs.bash
git add -Af "${GITHUB_WORKSPACE}/docs"
Expand Down
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
| | |
|:---|:---|
|**_Related Issue(s)_**| |
|**_Has Unit Tests (y/n)_**| ||
|**_Has Unit Tests (y/n)_**| |
|**_Documentation Included (y/n)_**| |

---
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/build-test-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ name: macOS-CI
# events but only for the master branch
on:
push:
branches: [ master, devel ]
branches: [ devel, release/** ]
pull_request:
branches: [ master, devel ]
# The branches below must be a subset of the branches above
branches: [ devel, release/** ]
paths-ignore:
- 'docs/**'
- '**.md'
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/build-test-rpi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ name: RPI-CI
# events but only for the master branch
on:
push:
branches: [ master, devel ]
branches: [ devel, release/** ]
pull_request:
branches: [ master, devel ]
# The branches below must be a subset of the branches above
branches: [ devel, release/** ]
paths-ignore:
- 'docs/**'
- '**.md'
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ name: CI
# events but only for the master branch
on:
push:
branches: [ master, devel ]
branches: [ devel, release/** ]
pull_request:
branches: [ master, devel ]
# The branches below must be a subset of the branches above
branches: [ devel, release/** ]
paths-ignore:
- 'docs/**'
- '**.md'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-jpl-standard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ name: "JPL Coding Standard Scan"

on:
push:
branches: [ master, devel ]
branches: [ devel, release/** ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master, devel ]
branches: [ devel, release/** ]
paths-ignore:
- 'docs/**'
- '**.md'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-security-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ name: "CodeQL Security Scan"

on:
push:
branches: [ master, devel ]
branches: [ devel, release/** ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master, devel ]
branches: [ devel, release/** ]
paths-ignore:
- 'docs/**'
- '**.md'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cppcheck-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: "Cppcheck Scan"

on:
push:
branches: [ master, devel ]
branches: [ devel, release/** ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master, devel ]
branches: [ devel, release/** ]
paths-ignore:
- 'docs/**'
- '**.md'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cpplint-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: "Cpplint Scan"

on:
push:
branches: [master, devel]
branches: [ devel, release/** ]
pull_request:
# The branches below must be a subset of the branches above
branches: [master, devel ]
branches: [ devel, release/** ]
paths-ignore:
- 'docs/**'
- '**.md'
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/ext-build-hello-world.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ name: "Tutorial: HelloWorld"

on:
push:
branches: [ master, devel ]
branches: [ devel, release/** ]
pull_request:
branches: [ master, devel ]
# The branches below must be a subset of the branches above
branches: [ devel, release/** ]
paths-ignore:
- 'docs/**'
- '**.md'
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/ext-build-led-blinker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ name: "Tutorial: LedBlinker"

on:
push:
branches: [ master, devel ]
branches: [ devel, release/** ]
pull_request:
branches: [ master, devel ]
# The branches below must be a subset of the branches above
branches: [ devel, release/** ]
paths-ignore:
- 'docs/**'
- '**.md'
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/ext-build-math-comp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ name: "Tutorial: MathComponent"

on:
push:
branches: [ master, devel ]
branches: [ devel, release/** ]
pull_request:
branches: [ master, devel ]
# The branches below must be a subset of the branches above
branches: [ devel, release/** ]
paths-ignore:
- 'docs/**'
- '**.md'
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/ext-raspberry-led-blinker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ name: "RPI LedBlinker"

on:
push:
branches: [ master, devel ]
branches: [ devel, release/** ]
pull_request:
branches: [ master, devel ]
# The branches below must be a subset of the branches above
branches: [ devel, release/** ]
paths-ignore:
- 'docs/**'
- '**.md'
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/fpp-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ name: "FppTest"

on:
push:
branches: [ master, devel ]
branches: [ devel, release/** ]
pull_request:
branches: [ master, devel ]
# The branches below must be a subset of the branches above
branches: [ devel, release/** ]
paths-ignore:
- 'docs/**'
- '**.md'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: Format Python

on:
push:
branches: [master, devel]
branches: [ devel, release/** ]
pull_request:
# The branches below must be a subset of the branches above
branches: [master, devel]
branches: [ devel, release/** ]

jobs:
format:
Expand Down
2 changes: 1 addition & 1 deletion docs/UsersGuide/cmake/cmake-platforms.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ Build flags and other includes can be added in to support different compile-time

In order to create a new platform from scratch, the user can copy "platform.cmake.template" and fill it out to generate the new platform file. It will guide the user through the setup of this piece.

To understand the platform template: [Platform Template File](https://github.com/nasa/fprime/blob/release/documentation/docs/UsersGuide/api/cmake/platform/platform-template.md)
To understand the platform template: [Platform Template File](https://github.com/nasa/fprime/blob/docs/auto-documentation/docs/UsersGuide/api/cmake/platform/platform-template.md)
To use the template: [fprime Platform Template](https://github.com/nasa/fprime/blob/devel/cmake/platform/platform.cmake.template)