From 730a11eba0c7b34ae5ce6a6ddef6894e07b46bfb Mon Sep 17 00:00:00 2001 From: bradleysmith23 Date: Thu, 14 Dec 2023 13:41:53 -0800 Subject: [PATCH 1/9] Tie CBMC to 5.95.1 given 6.0.0 alpha is causing PR's to fail --- set_up_cbmc_runner/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/set_up_cbmc_runner/action.yml b/set_up_cbmc_runner/action.yml index 37f159eb..e9d4a1e2 100644 --- a/set_up_cbmc_runner/action.yml +++ b/set_up_cbmc_runner/action.yml @@ -4,9 +4,9 @@ name: Set up CBMC runner inputs: cbmc_version: - description: Version number or 'latest' for CBMC + description: Version number or '5.95.1' for CBMC required: true - default: latest + default: 5.95.1 cbmc_viewer_version: description: Version number or 'latest' for CBMC Viewer required: true From e9c975e92a93d1a960aca6e69a61ffbd1580d246 Mon Sep 17 00:00:00 2001 From: bradleysmith23 Date: Thu, 14 Dec 2023 13:54:46 -0800 Subject: [PATCH 2/9] exclude portable dir from formatting check --- .github/workflows/pr_checks.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pr_checks.yml b/.github/workflows/pr_checks.yml index b2d56600..6b3a50e8 100644 --- a/.github/workflows/pr_checks.yml +++ b/.github/workflows/pr_checks.yml @@ -28,6 +28,7 @@ jobs: run-link-verifier: true, run-complexity: false, run-doxygen: false, + exclude-dirs: portable }, { repository: FreeRTOS-Plus-TCP, From b766ac81194449ce5da5a0de3e4ef06360ef829f Mon Sep 17 00:00:00 2001 From: bradleysmith23 <74752142+bradleysmith23@users.noreply.github.com> Date: Thu, 14 Dec 2023 13:55:06 -0800 Subject: [PATCH 3/9] Update set_up_cbmc_runner/action.yml Co-authored-by: Soren Ptak --- set_up_cbmc_runner/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/set_up_cbmc_runner/action.yml b/set_up_cbmc_runner/action.yml index e9d4a1e2..b82f5e90 100644 --- a/set_up_cbmc_runner/action.yml +++ b/set_up_cbmc_runner/action.yml @@ -4,7 +4,7 @@ name: Set up CBMC runner inputs: cbmc_version: - description: Version number or '5.95.1' for CBMC + description: Version number or '5.95.1' for CBMC. NOTE: This is because of the fact that the 6.0.0 alpha release isn't meant for production use. When the full release happens this should be set back to using the 'latest' https://github.com/diffblue/cbmc/releases/tag/cbmc-6.0.0-alpha required: true default: 5.95.1 cbmc_viewer_version: From c8c0bf37de49d2f82c6f80ea9b3ecd223be44eba Mon Sep 17 00:00:00 2001 From: bradleysmith23 Date: Thu, 14 Dec 2023 14:04:00 -0800 Subject: [PATCH 4/9] update exclude-dirs location --- .github/workflows/pr_checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr_checks.yml b/.github/workflows/pr_checks.yml index 6b3a50e8..bf9b2f5e 100644 --- a/.github/workflows/pr_checks.yml +++ b/.github/workflows/pr_checks.yml @@ -28,7 +28,6 @@ jobs: run-link-verifier: true, run-complexity: false, run-doxygen: false, - exclude-dirs: portable }, { repository: FreeRTOS-Plus-TCP, @@ -324,6 +323,7 @@ jobs: repository: FreeRTOS-Kernel, org: FreeRTOS, branch: main, + exclude-dirs: portable }, { repository: FreeRTOS-Plus-TCP, From 227aa0a1c38ea43246e3c02f692a60a00ad842ca Mon Sep 17 00:00:00 2001 From: bradleysmith23 Date: Thu, 14 Dec 2023 14:11:06 -0800 Subject: [PATCH 5/9] Update exclude-dirs usage --- .github/workflows/pr_checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr_checks.yml b/.github/workflows/pr_checks.yml index bf9b2f5e..e05688f8 100644 --- a/.github/workflows/pr_checks.yml +++ b/.github/workflows/pr_checks.yml @@ -419,4 +419,4 @@ jobs: with: path: repo/${{ matrix.inputs.repository }} exclude-files: ${{ matrix.inputs.exclude-files }} - exclude-dirs: ethernet, drivers, FreeRTOS/Demo + exclude-dirs: ${{ matrix.inputs.exclude-dirs }} From d614a0a14dcfae96e2cb0b2b232525caa9f3438c Mon Sep 17 00:00:00 2001 From: bradleysmith23 Date: Thu, 14 Dec 2023 14:28:34 -0800 Subject: [PATCH 6/9] Add exclude dirs for FreeRTOS repo --- .github/workflows/pr_checks.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pr_checks.yml b/.github/workflows/pr_checks.yml index e05688f8..951a3b2f 100644 --- a/.github/workflows/pr_checks.yml +++ b/.github/workflows/pr_checks.yml @@ -334,6 +334,7 @@ jobs: repository: FreeRTOS, org: FreeRTOS, branch: main, + exclude-dirs: ethernet, drivers, FreeRTOS/Demo }, { repository: FreeRTOS-Cellular-Interface, From d64addcaeab192978200a0bd9d85629d840c2d4f Mon Sep 17 00:00:00 2001 From: bradleysmith23 Date: Thu, 14 Dec 2023 14:52:59 -0800 Subject: [PATCH 7/9] Make exclude-dirs an array --- .github/workflows/pr_checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr_checks.yml b/.github/workflows/pr_checks.yml index 951a3b2f..87ee507e 100644 --- a/.github/workflows/pr_checks.yml +++ b/.github/workflows/pr_checks.yml @@ -334,7 +334,7 @@ jobs: repository: FreeRTOS, org: FreeRTOS, branch: main, - exclude-dirs: ethernet, drivers, FreeRTOS/Demo + exclude-dirs: [ethernet, drivers, FreeRTOS/Demo] }, { repository: FreeRTOS-Cellular-Interface, From 28f6ed20cb3717ec457e2920f47ffbcb395a8ac9 Mon Sep 17 00:00:00 2001 From: bradleysmith23 <74752142+bradleysmith23@users.noreply.github.com> Date: Thu, 14 Dec 2023 14:55:46 -0800 Subject: [PATCH 8/9] Update .github/workflows/pr_checks.yml Co-authored-by: Soren Ptak --- .github/workflows/pr_checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr_checks.yml b/.github/workflows/pr_checks.yml index 87ee507e..951a3b2f 100644 --- a/.github/workflows/pr_checks.yml +++ b/.github/workflows/pr_checks.yml @@ -334,7 +334,7 @@ jobs: repository: FreeRTOS, org: FreeRTOS, branch: main, - exclude-dirs: [ethernet, drivers, FreeRTOS/Demo] + exclude-dirs: ethernet, drivers, FreeRTOS/Demo }, { repository: FreeRTOS-Cellular-Interface, From 12d71f643c8cafe8cbb37458faaae05b0dd4550c Mon Sep 17 00:00:00 2001 From: bradleysmith23 Date: Thu, 14 Dec 2023 15:12:41 -0800 Subject: [PATCH 9/9] add single quotes around exclude-dirs lists --- .github/workflows/pr_checks.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr_checks.yml b/.github/workflows/pr_checks.yml index 951a3b2f..181647e5 100644 --- a/.github/workflows/pr_checks.yml +++ b/.github/workflows/pr_checks.yml @@ -323,7 +323,7 @@ jobs: repository: FreeRTOS-Kernel, org: FreeRTOS, branch: main, - exclude-dirs: portable + exclude-dirs: 'portable' }, { repository: FreeRTOS-Plus-TCP, @@ -334,7 +334,7 @@ jobs: repository: FreeRTOS, org: FreeRTOS, branch: main, - exclude-dirs: ethernet, drivers, FreeRTOS/Demo + exclude-dirs: 'ethernet, drivers, FreeRTOS/Demo' }, { repository: FreeRTOS-Cellular-Interface,