Skip to content

Commit

Permalink
Merge pull request #622 from jphickey/fix-621-action-versions
Browse files Browse the repository at this point in the history
Fix #621, update action versions to v3
  • Loading branch information
dzbaker committed Dec 6, 2022
2 parents 1b0b338 + 5a1174f commit 75ce7fb
Show file tree
Hide file tree
Showing 13 changed files with 135 additions and 136 deletions.
58 changes: 29 additions & 29 deletions .github/workflows/build-cfs-deprecated.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ defaults:
shell: bash

jobs:
#Checks for duplicate actions. Skips push actions if there is a matching or duplicate pull-request action.
#Checks for duplicate actions. Skips push actions if there is a matching or duplicate pull-request action.
check-for-duplicates:
runs-on: ubuntu-latest
# Map a step output to a job output
Expand All @@ -31,7 +31,7 @@ jobs:
concurrent_skipping: 'same_content'
skip_after_successful_duplicate: 'true'
do_not_skip: '["pull_request", "workflow_dispatch", "schedule"]'

build-cfs-omit-deprecated-false:
name: "[Deprecated] Build"
needs: check-for-duplicates
Expand All @@ -45,36 +45,36 @@ jobs:

# Set the type of machine to run on
env:
BUILDTYPE: ${{ matrix.buildtype }}
BUILDTYPE: ${{ matrix.buildtype }}

steps:
- name: Cache Source and Build
id: cache-src-bld
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: /home/runner/work/${{ env.REPO_NAME }}/${{ env.REPO_NAME }}/*
key: deprecated-build-${{ github.run_number }}-${{ matrix.buildtype }}

- name: Checkout cFS
if: steps.cache-src-bld.outputs.cache-hit != 'true'
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: true

- name: Check versions
run: git submodule

- name: Copy Makefile
run: |
cp ./cfe/cmake/Makefile.sample Makefile
cp -r ./cfe/cmake/sample_defs sample_defs
- name: Prep Build
run: make prep
run: make prep

- name: Make
run: make install

tests-and-coverage-omit-deprecated-false:
name: "[Deprecated] Run Unit Tests and Check Coverage"
needs: build-cfs-omit-deprecated-false
Expand All @@ -93,14 +93,14 @@ jobs:
steps:
- name: Install Dependencies
run: sudo apt-get install lcov -y

- name: Cache Source and Deprecated Build
id: cache-src-bld
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: /home/runner/work/${{ env.REPO_NAME }}/${{ env.REPO_NAME }}/*
key: deprecated-build-${{ github.run_number }}-${{ matrix.buildtype }}
key: deprecated-build-${{ github.run_number }}-${{ matrix.buildtype }}

- name: Run Tests
run: make test

Expand All @@ -124,7 +124,7 @@ jobs:
steps:
- name: Cache Source and Deprecated Build
id: cache-src-bld
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: /home/runner/work/${{ env.REPO_NAME }}/${{ env.REPO_NAME }}/*
key: deprecated-build-${{ github.run_number }}-${{ matrix.buildtype }}
Expand All @@ -141,7 +141,7 @@ jobs:
working-directory: ./build/exe/cpu1/

- name: Archive cFS Startup Artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: cFS-startup-log-omit-deprecate-false${{ matrix.buildtype }}
path: ./build/exe/cpu1/cFS_startup_cpu1.txt
Expand All @@ -162,16 +162,16 @@ jobs:
name: "[DEPRECATED] cFS Functional Tests"
runs-on: ubuntu-20.04
timeout-minutes: 15

strategy:
fail-fast: false
matrix:
buildtype: [debug, release]

steps:
steps:
- name: Cache Source and Deprecated Build
id: cache-src-bld
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: /home/runner/work/${{ env.REPO_NAME }}/${{ env.REPO_NAME }}/*
key: deprecated-build-${{ github.run_number }}-${{ matrix.buildtype }}
Expand All @@ -188,34 +188,34 @@ jobs:
../host/cmdUtil --pktid=0x1806 --cmdcode=14 --endian=LE --uint32=2
../host/cmdUtil --pktid=0x1806 --cmdcode=4 --endian=LE --string="20:CFE_TEST_APP" --string="20:CFE_TestMain" --string="64:cfe_testcase" --uint32=16384 --uint8=0 --uint8=0 --uint16=100
sleep 30
counter=0
while [[ ! -f cf/cfe_test.log ]]; do
temp=$(grep -c "BEGIN" cf/cfe_test.tmp)
counter=0
while [[ ! -f cf/cfe_test.log ]]; do
temp=$(grep -c "BEGIN" cf/cfe_test.tmp)
if [ $temp -eq $counter ]; then
echo "Test is frozen. Quiting"
break
fi
counter=$(grep -c "BEGIN" cf/cfe_test.tmp)
counter=$(grep -c "BEGIN" cf/cfe_test.tmp)
echo "Waiting for CFE Tests"
sleep 60
done
../host/cmdUtil --endian=LE --pktid=0x1806 --cmdcode=2 --half=0x0002
working-directory: ./build/exe/cpu1/

- name: Archive Functional Test Artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: cFS-functional-test-log-omit-deprecate-false-${{ matrix.buildtype }}
path: ./build/exe/cpu1/cf/cfe_test.log

- name: Check for cFS Warnings
run: |
run: |
if [[ -z $(grep -i "SUMMARY.*FAIL::0.*TSF::0.*TTF::0" cf/cfe_test.log) ]]; then
echo "Must resolve Test Failures in cFS Test App before submitting a pull request"
echo ""
grep -i '\[ FAIL]\|\[ TSF]\|\[ TTF]' cf/cfe_test.log
exit -1
fi
working-directory: ./build/exe/cpu1/
working-directory: ./build/exe/cpu1/
12 changes: 6 additions & 6 deletions .github/workflows/build-cfs-rtems4.11.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ defaults:
shell: bash

jobs:
#Checks for duplicate actions. Skips push actions if there is a matching or duplicate pull-request action.
#Checks for duplicate actions. Skips push actions if there is a matching or duplicate pull-request action.
check-for-duplicates:
runs-on: ubuntu-latest
# Map a step output to a job output
Expand All @@ -28,7 +28,7 @@ jobs:
concurrent_skipping: 'same_content'
skip_after_successful_duplicate: 'true'
do_not_skip: '["pull_request", "workflow_dispatch", "schedule"]'

build-cfs:
#Continue if check-for-duplicates found no duplicates. Always runs for pull-requests.
needs: check-for-duplicates
Expand All @@ -51,7 +51,7 @@ jobs:
steps:
# Check out the cfs bundle
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: true

Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
steps:
# Checks out a copy of your repository on the ubuntu-latest machine
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: true

Expand All @@ -104,7 +104,7 @@ jobs:
# Setup the build system
- name: Make
run: |
run: |
make SIMULATION=i686-rtems4.11 prep
make install
Expand All @@ -124,7 +124,7 @@ jobs:
# Always archive test logs
- name: Archive cFS Test Artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
# Runs even if previous steps have failed
if: always()
with:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build-cfs-rtems5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ defaults:
shell: bash

jobs:
#Checks for duplicate actions. Skips push actions if there is a matching or duplicate pull-request action.
#Checks for duplicate actions. Skips push actions if there is a matching or duplicate pull-request action.
check-for-duplicates:
runs-on: ubuntu-latest
# Map a step output to a job output
Expand All @@ -28,7 +28,7 @@ jobs:
concurrent_skipping: 'same_content'
skip_after_successful_duplicate: 'true'
do_not_skip: '["pull_request", "workflow_dispatch", "schedule"]'

build-cfs:
#Continue if check-for-duplicates found no duplicates. Always runs for pull-requests.
needs: check-for-duplicates
Expand All @@ -51,7 +51,7 @@ jobs:
steps:
# Check out the cfs bundle
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: true

Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
steps:
# Checks out a copy of your repository on the ubuntu-latest machine
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: true

Expand Down Expand Up @@ -122,7 +122,7 @@ jobs:
# Always archive test logs
- name: Archive cFS Test Artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
# Runs even if previous steps have failed
if: always()
with:
Expand Down
Loading

0 comments on commit 75ce7fb

Please sign in to comment.