update following feedback

Author: anthony-nhs

.github/copilot-instructions.md

@@ -11,12 +11,12 @@ Check the following files for any project-specific coding standards or guideline
 Always follow security best practices as outlined in:
 - .github/instructions/general/security.instructions.md
 Follow additional language-specific guidelines in:
-- .github/instructions/language-specific/cdk.instructions.md
-- .github/instructions/language-specific/cloudformation.instructions.md
-- .github/instructions/language-specific/python.instructions.md
-- .github/instructions/language-specific/terraform.instructions.md
-- .github/instructions/language-specific/sam.instructions.md
-- .github/instructions/language-specific/typescript.instructions.md
+- .github/instructions/languages/cdk.instructions.md
+- .github/instructions/languages/cloudformation.instructions.md
+- .github/instructions/languages/python.instructions.md
+- .github/instructions/languages/terraform.instructions.md
+- .github/instructions/languages/sam.instructions.md
+- .github/instructions/languages/typescript.instructions.md
 
 ## Project-Specific Rules
 - Use our custom logging service

.github/instructions/general/security.instructions.md

@@ -1,5 +1,5 @@
 ---
-applyTo: '*/*'
+applyTo: '**/*'
 description: "Comprehensive secure coding instructions for all languages and frameworks, based on OWASP Top 10 and industry best practices."
 ---
 # Secure Coding and OWASP Guidelines

.github/workflows/sync_copilot.yml

@@ -9,7 +9,7 @@ on:
         default: "main"
         type: string
       calling_repo_base_branch:
-        description: "The base branch from the calling repository for"
+        description: "The base branch from the calling repository that should be merged into"
         required: false
         type: string
         default: main
@@ -21,7 +21,7 @@ on:
 
 jobs:
   sync:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       contents: write
       pull-requests: write
@@ -41,16 +41,22 @@ jobs:
           path: eps-common-workflows
           repository: NHSDigital/eps-common-workflows
           sparse-checkout: |
-            - .github/instructions/general
-            - .github/instructions/languages
-            - .github/copilot-instructions.md
-            - .github/prompts
+            .github/instructions/general
+            .github/instructions/languages
+            .github/copilot-instructions.md
+            .github/prompts
 
       - name: Copy central instructions
         run: |
-          mv eps-common-workflows/.github/instructions .github/instructions
-          mv eps-common-workflows/.github/copilot-instructions.md .github/copilot-instructions.md
-          mv eps-common-workflows/.github/prompts .github/prompts
+          rm -rf .github/instructions/general
+          rm -rf .github/instructions/languages
+          rm -rf .github/copilot-instructions.md
+          rm -rf .github/prompts
+          mkdir -p .github/instructions/
+          cp -R eps-common-workflows/.github/instructions/general .github/instructions/general
+          cp -R eps-common-workflows/.github/instructions/languages .github/instructions/languages
+          cp eps-common-workflows/.github/copilot-instructions.md .github/copilot-instructions.md
+          cp -R eps-common-workflows/.github/prompts .github/prompts
           rm -rf eps-common-workflows
 
       - name: Create GitHub App Token

README.md

@@ -8,7 +8,7 @@ The workflows that are available to use are
 
 - [Combine Dependabot PRs](#combine-dependabot-prs)
 - [Dependabot Auto Approve and Merge](#dependabot-auto-approve-and-merge)
-- [Sync copilot instructios](#sync-copilot-instructions)
+- [Sync copilot instructions](#sync-copilot-instructions)
 - [PR Title Check](#pr-title-check)
 - [Get Repo Config](#get-repo-config)
 - [Quality Checks](#quality-checks)
@@ -116,7 +116,7 @@ This workflow syncs Copilot instructions from this repo into another repo and op
 #### Inputs
 
 - `common_workflows_ref`: Branch in common workflows repo to sync from. Default: `main`
-- `base_branch`: The base branch in the calling repository. Default: `main`.
+- `calling_repo_base_branch`: The base branch in the calling repository. Default: `main`.
 
 #### Secret Inputs