From 04f45501744942716537b42fb3d3ef1f6479a534 Mon Sep 17 00:00:00 2001
From: busticated <itsbusticated@gmail.com>
Date: Wed, 13 Jul 2022 09:38:40 -0700
Subject: [PATCH 1/2] move test build scripts from scripts/* to ci/*

---
 .circleci/config.yml                 | 4 ++--
 {scripts => ci}/test-build-tasks.ps1 | 0
 {scripts => ci}/test-build-tasks.sh  | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename {scripts => ci}/test-build-tasks.ps1 (100%)
 rename {scripts => ci}/test-build-tasks.sh (100%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 647ca04692..aa6a64bae5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -341,7 +341,7 @@ commands:
       - run:
           name: "Test Local Compilation Tasks"
           no_output_timeout: "20m"
-          command: scripts/test-build-tasks.sh ~/project "<< parameters.platform >>" "<< parameters.tasks >>"
+          command: ci/test-build-tasks.sh ~/project "<< parameters.platform >>" "<< parameters.tasks >>"
           environment:
             PRTCL_DISABLE_AUTOUPDATE: "1"
   test-localcompiler-windows:
@@ -354,7 +354,7 @@ commands:
       - run:
           name: "Test Local Compilation Tasks"
           no_output_timeout: "20m"
-          command: pwsh scripts/test-build-tasks.ps1 $home\project "<< parameters.platform >>" "<< parameters.tasks >>"
+          command: pwsh ci/test-build-tasks.ps1 $home\project "<< parameters.platform >>" "<< parameters.tasks >>"
           environment:
             PRTCL_DISABLE_AUTOUPDATE: "1"
   save-platform-to-workspace:
diff --git a/scripts/test-build-tasks.ps1 b/ci/test-build-tasks.ps1
similarity index 100%
rename from scripts/test-build-tasks.ps1
rename to ci/test-build-tasks.ps1
diff --git a/scripts/test-build-tasks.sh b/ci/test-build-tasks.sh
similarity index 100%
rename from scripts/test-build-tasks.sh
rename to ci/test-build-tasks.sh

From bffadf1cb33250645e7715e2a97bbb0e8dd9c11a Mon Sep 17 00:00:00 2001
From: busticated <itsbusticated@gmail.com>
Date: Wed, 13 Jul 2022 09:39:54 -0700
Subject: [PATCH 2/2] stop ignoring the scripts directory when creating
 toolchain bundles scripts directory now contains p2-related debugging scripts
 needed to drive Workbench UX

---
 .bundleignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.bundleignore b/.bundleignore
index 6440c7425c..d3b9ed0e57 100644
--- a/.bundleignore
+++ b/.bundleignore
@@ -2,7 +2,6 @@
 /ci
 /docs
 /misc
-/scripts
 /build/target
 /third_party/nrf5_sdk/nrf5_sdk/examples
 /third_party/nrf5_sdk/nrf5_sdk/components/802_15_4