From 95d9303adc94cb80b4d4cb2b241c6ee37f5121a2 Mon Sep 17 00:00:00 2001 From: havencarlson Date: Fri, 19 Aug 2022 14:36:53 -0400 Subject: [PATCH] Fix #554, Updated ubuntu version in CI workflows --- .github/workflows/build-cfs-deprecated.yml | 8 ++++---- .github/workflows/build-cfs-rtems4.11.yml | 4 ++-- .github/workflows/build-cfs-rtems5.yml | 4 ++-- .github/workflows/build-cfs.yml | 8 ++++---- .github/workflows/build-deploy-doc.yml | 2 +- .github/workflows/build-run-app.yml | 2 +- .github/workflows/codeql-reusable.yml | 4 ++-- .github/workflows/format-check.yml | 8 ++++---- .github/workflows/static-analysis.yml | 2 +- .github/workflows/unit-test-coverage.yml | 2 +- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build-cfs-deprecated.yml b/.github/workflows/build-cfs-deprecated.yml index 565ab4f40..a0ae71501 100644 --- a/.github/workflows/build-cfs-deprecated.yml +++ b/.github/workflows/build-cfs-deprecated.yml @@ -36,7 +36,7 @@ jobs: name: "[Deprecated] Build" needs: check-for-duplicates if: ${{ needs.check-for-duplicates.outputs.should_skip != 'true' }} - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: fail-fast: false @@ -78,7 +78,7 @@ jobs: tests-and-coverage-omit-deprecated-false: name: "[Deprecated] Run Unit Tests and Check Coverage" needs: build-cfs-omit-deprecated-false - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: fail-fast: false @@ -110,7 +110,7 @@ jobs: run-cfs-omit-deprecated-false: name: "[Deprecated] Run cFS" needs: build-cfs-omit-deprecated-false - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: fail-fast: false @@ -160,7 +160,7 @@ jobs: #Continue if check-for-duplicates found no duplicates. Always runs for pull-requests. needs: run-cfs-omit-deprecated-false name: "[DEPRECATED] cFS Functional Tests" - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 timeout-minutes: 15 strategy: diff --git a/.github/workflows/build-cfs-rtems4.11.yml b/.github/workflows/build-cfs-rtems4.11.yml index 81524d0c0..63151ad0b 100644 --- a/.github/workflows/build-cfs-rtems4.11.yml +++ b/.github/workflows/build-cfs-rtems4.11.yml @@ -34,7 +34,7 @@ jobs: needs: check-for-duplicates if: ${{ needs.check-for-duplicates.outputs.should_skip != 'true' }} name: Build - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 container: ghcr.io/core-flight-system/qemu-rtems-4-11:latest strategy: @@ -70,7 +70,7 @@ jobs: test-cfs: name: Test - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 container: ghcr.io/core-flight-system/qemu-rtems-4-11:latest needs: build-cfs diff --git a/.github/workflows/build-cfs-rtems5.yml b/.github/workflows/build-cfs-rtems5.yml index 35866d88d..c0419b32d 100644 --- a/.github/workflows/build-cfs-rtems5.yml +++ b/.github/workflows/build-cfs-rtems5.yml @@ -34,7 +34,7 @@ jobs: needs: check-for-duplicates if: ${{ needs.check-for-duplicates.outputs.should_skip != 'true' }} name: Build - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 container: ghcr.io/core-flight-system/qemu-rtems-5:latest strategy: @@ -70,7 +70,7 @@ jobs: test-cfs: name: Test - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 container: ghcr.io/core-flight-system/qemu-rtems-5:latest needs: build-cfs diff --git a/.github/workflows/build-cfs.yml b/.github/workflows/build-cfs.yml index 4cff77f1f..4c72579ab 100644 --- a/.github/workflows/build-cfs.yml +++ b/.github/workflows/build-cfs.yml @@ -36,7 +36,7 @@ jobs: name: Build needs: check-for-duplicates if: ${{ needs.check-for-duplicates.outputs.should_skip != 'true' }} - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: fail-fast: false @@ -77,7 +77,7 @@ jobs: tests-and-coverage-omit-deprecated-true: name: Run Unit Tests and Check Coverage needs: build-cfs-omit-deprecated-true - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: fail-fast: false @@ -109,7 +109,7 @@ jobs: run-cfs-omit-deprecated-true: name: Run needs: build-cfs-omit-deprecated-true - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: fail-fast: false @@ -158,7 +158,7 @@ jobs: run-functional-test-app-omit-deprecated-true: #Continue if check-for-duplicates found no duplicates. Always runs for pull-requests. needs: run-cfs-omit-deprecated-true - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 timeout-minutes: 15 strategy: diff --git a/.github/workflows/build-deploy-doc.yml b/.github/workflows/build-deploy-doc.yml index c82894c79..e29e9fc5d 100644 --- a/.github/workflows/build-deploy-doc.yml +++ b/.github/workflows/build-deploy-doc.yml @@ -55,7 +55,7 @@ jobs: needs: checks-for-duplicates if: ${{ needs.checks-for-duplicates.outputs.should_skip != 'true' || contains(github.ref, 'main') }} name: Build Documentation - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: fail-fast: false diff --git a/.github/workflows/build-run-app.yml b/.github/workflows/build-run-app.yml index 993d40dcf..be5a72d73 100644 --- a/.github/workflows/build-run-app.yml +++ b/.github/workflows/build-run-app.yml @@ -40,7 +40,7 @@ jobs: needs: checks-for-duplicates if: ${{ needs.checks-for-duplicates.outputs.should_skip != 'true' || contains(github.ref, 'main') }} name: Build and run app, confirm startup message - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - name: Set up environment variables diff --git a/.github/workflows/codeql-reusable.yml b/.github/workflows/codeql-reusable.yml index f88488e61..8c409667e 100644 --- a/.github/workflows/codeql-reusable.yml +++ b/.github/workflows/codeql-reusable.yml @@ -55,7 +55,7 @@ env: jobs: #Checks for duplicate actions. Skips push actions if there is a matching or duplicate pull-request action. check-for-duplicates: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 # Map a step output to a job output outputs: should_skip: ${{ steps.skip_check.outputs.should_skip }} @@ -71,7 +71,7 @@ jobs: #Continue if check-for-duplicates found no duplicates. Always runs for pull-requests. needs: check-for-duplicates if: ${{ needs.check-for-duplicates.outputs.should_skip != 'true' }} - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 timeout-minutes: 15 strategy: diff --git a/.github/workflows/format-check.yml b/.github/workflows/format-check.yml index 2abe417c0..0836a7f06 100644 --- a/.github/workflows/format-check.yml +++ b/.github/workflows/format-check.yml @@ -31,7 +31,7 @@ jobs: #Continue if check-for-duplicates found no duplicates. Always runs for pull-requests. needs: check-for-duplicates if: ${{ needs.check-for-duplicates.outputs.should_skip != 'true' }} - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 timeout-minutes: 15 steps: @@ -39,7 +39,7 @@ jobs: run: | wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - sudo add-apt-repository 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main' - sudo apt-get update && sudo apt-get install clang-format-10 + sudo apt-get update && sudo apt-get install clang-format-12 - name: Checkout bundle uses: actions/checkout@v2 @@ -54,7 +54,7 @@ jobs: - name: Generate format differences run: | cd repo - find . -name "*.[ch]" -exec clang-format-10 -i -style=file {} + + find . -name "*.[ch]" -exec clang-format-12 -i -style=file {} + git diff > $GITHUB_WORKSPACE/style_differences.txt - name: Archive Static Analysis Artifacts @@ -76,7 +76,7 @@ jobs: needs: check-for-duplicates # Only run for pull-requests. if: ${{ github.event_name == 'pull_request' }} - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 timeout-minutes: 15 steps: # Check github pull-request title against the pattern. diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index decb2fda6..cd966e920 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -33,7 +33,7 @@ jobs: needs: check-for-duplicates if: ${{ needs.check-for-duplicates.outputs.should_skip != 'true' }} name: Run cppcheck - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: fail-fast: false diff --git a/.github/workflows/unit-test-coverage.yml b/.github/workflows/unit-test-coverage.yml index 919bbea58..bfee2b691 100644 --- a/.github/workflows/unit-test-coverage.yml +++ b/.github/workflows/unit-test-coverage.yml @@ -45,7 +45,7 @@ jobs: needs: checks-for-duplicates if: ${{ needs.checks-for-duplicates.outputs.should_skip != 'true' || contains(github.ref, 'main') }} name: Build, run unit tests and enforce coverage - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - name: Install coverage tools