diff --git a/.github/workflows/pull-request-merge-main.yml b/.github/workflows/pull-request-merge-main.yml index 95e77b13..b2647e4f 100644 --- a/.github/workflows/pull-request-merge-main.yml +++ b/.github/workflows/pull-request-merge-main.yml @@ -9,9 +9,9 @@ defaults: shell: bash on: - pull_request: - types: [opened, reopened, synchronize] - branches: [main] + pull_request: # TODO + # types: [opened, reopened, synchronize] + # branches: [main] permissions: contents: read @@ -52,7 +52,7 @@ jobs: workflow: 'pull-request-code-scan.yml' repo: cdcent/data-exchange-hl7-devops token: ${{ env.access_token }} - inputs: '{ "pathsToScan": "${{ steps.getdirs2scan.outputs.dirs }}", "repositoryToScan": "${{ github.repository }}", "prToScan": "${{ github.head_ref || github.ref_name }}" }' + inputs: '{ "pathsToScan": ${{ steps.getdirs2scan.outputs.dirs }}, "repositoryToScan": "${{ github.repository }}", "prToScan": "${{ github.head_ref || github.ref_name }}" }' ref: 'main' wait-for-completion: true wait-for-completion-timeout: 120m diff --git a/fns-sidecars/fn-sc-branch/delete.me b/fns-sidecars/fn-sc-branch/delete.me new file mode 100644 index 00000000..e69de29b diff --git a/tools/codeScan/gitDiffAnalysis.py b/tools/codeScan/gitDiffAnalysis.py index 93751af3..88e0c357 100644 --- a/tools/codeScan/gitDiffAnalysis.py +++ b/tools/codeScan/gitDiffAnalysis.py @@ -19,6 +19,8 @@ def analyze_paths(changed_files, nested_folders): # Skip files ending with '.md' if file_path.endswith('.md'): continue + if file_path.beginswith('.github'): + continue path_parts = file_path.split('/') top_level_folder = path_parts[0] @@ -52,7 +54,8 @@ def main(): changed_files = fetch_changed_files() unique_folders = analyze_paths(changed_files, nested_folders) output = [{"path": folder, "app": get_app_version(folder)} for folder in unique_folders] - print(json.dumps(output)) + escaped_output = json.dumps(output) + print(json.dumps(escaped_output)) except Exception as e: print(str(e))