From 7216fa7566ea789963cc76ad102932e9a55ea0e4 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Fri, 6 Aug 2021 17:57:14 -0400 Subject: [PATCH 1/3] Fix #331, Skip documentation deploy job Moves the branch push check conditional "up" in the documentation build workflow. The check now happens at the deploy job level instead of the deploy step step for both the deploy-usersguide and deploy-osalguide. This saves time by preventing loading extra VMs in pull requests and other repository push events. --- .github/workflows/build-documentation.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-documentation.yml b/.github/workflows/build-documentation.yml index 97da9750f..17bfd0c65 100644 --- a/.github/workflows/build-documentation.yml +++ b/.github/workflows/build-documentation.yml @@ -153,11 +153,10 @@ jobs: key: usersguide-buildnum-${{ github.run_number }} deploy-usersguide: - needs: build-usersguide - # Name the Job name: Deploy Users Guide - # Set the type of machine to run on runs-on: ubuntu-18.04 + needs: build-usersguide + if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}} steps: - name: Cache cFS Build Environment for usersguide @@ -258,6 +257,7 @@ jobs: needs: build-osalguide name: Deploy Osal Guide runs-on: ubuntu-18.04 + if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}} steps: - name: Cache cFS Build Environment for osalguide @@ -268,7 +268,6 @@ jobs: key: osalguide-buildnum-${{ github.run_number }} - name: Deploy to GitHub - if: ${{ github.event_name == 'push' && contains(github.ref, 'main')}} uses: JamesIves/github-pages-deploy-action@3.7.1 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -276,3 +275,4 @@ jobs: FOLDER: deploy CLEAN: false SINGLE_COMMIT: true + From 43bbfe475e425bd177341e7cfb6c6ea6e09fe0f7 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Fri, 6 Aug 2021 18:32:03 -0400 Subject: [PATCH 2/3] IC:2021-08-10, cFE and osal **Combines** - nasa/cFE#1772, v6.8.0-rc1+dev844 - nasa/osal#1127, v5.1.0-rc1+dev590 **Includes** *cFE* - nasa/cFE#1737, Move global count into test global struct. - nasa/cFE#1722, Add ES application control API functional tests - nasa/cFE#1743, Update coverage test to use UtAssert macros - nasa/cFE#1734, Add table api functional tests - nasa/cfe#1753, Add Generic Counter API test - nasa/cfe#1766, finish ES misc API functional test - nasa/cFE#1764, last char truncated in coverage log output - nasa/cFE#1728, Mistakes in some copyright headers - nasa/cFE#1767, Add misc time api functional test cFE - nasa/cFE#1749, Add Functional Test for EVS Reset Filters API - nasa/cFE#1781, RTEMS CFE_FT_Global build failure - nasa/cFE#1796, replace VOIDCALL assert macro *osal* - nasa/osal#1117, Add absolute branch coverage check Co-authored-by: Joseph Hickey Co-authored-by: Alex Campbell Co-authored-by: Niall Mullane Co-authored-by: Paul --- cfe | 2 +- osal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cfe b/cfe index cfadad69a..eb9c52319 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit cfadad69aebc29a8151ec664a21173cca755b67a +Subproject commit eb9c52319fb1f31f72159551735ad5f1365e5a79 diff --git a/osal b/osal index 7f4ba9679..ce11e7a20 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit 7f4ba9679eba187410185a31e1f48126b5685189 +Subproject commit ce11e7a20d4fd9176469659acb1ee3b371ba4291 From ed34865c1ae241f675a9a45d6a0b15e37056b424 Mon Sep 17 00:00:00 2001 From: ArielSAdamsNASA Date: Thu, 29 Jul 2021 10:18:02 -0500 Subject: [PATCH 3/3] Fix #322, Add Discussions in Contributing Guide --- CONTRIBUTING.md | 4 +++- README.md | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ae7ec6992..40644263b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -24,7 +24,9 @@ This project and everyone participating in it is governed by the [cFS Code of Co ### Discussions and Questions -For questions or help, submit a GitHub issue, [join the cfs community mailing list](README.md#join-the-mailing-list). +For discussions, questions, or ideas, [start a new discussion](https://github.com/nasa/cFS/discussions/new) in the cFS repository under the Discussions tab. + +[Join the cfs community mailing list](README.md#join-the-mailing-list). ### Report Bugs diff --git a/README.md b/README.md index 4ad57ca90..a8c1311a8 100644 --- a/README.md +++ b/README.md @@ -71,8 +71,9 @@ See related repositories for current open issues. ## Getting Help -For best results, submit issues:questions or issues:help wanted requests to this repo. +### Discussions +You can [start a new discussion](https://github.com/nasa/cFS/discussions/new) for discussions, questions, or ideas, in the cFS repository under the Discussions tab. ### Join the mailing list @@ -86,7 +87,6 @@ If you'd like to unsubscribe, send an email with the word *unsubscribe* to cfs-c You can email the cFS Product Team at cfs-program@lists.nasa.gov to explore partnerships and other arrangements for in-depth support. - ## Setup Ensure the following software are installed: Make, CMake, GCC, and Git. To setup the cFS BUNDLE directly from the latest set of interoperable repositories: