Merge 4d7fda7 into a04e6ba

Author: iddqdex

.github/actions/test_ya/action.yml

@@ -252,13 +252,12 @@ runs:
         echo "::debug::get version"
         ./ya --version
 
-        export YA_MAKE_COMMAND="./ya make ${params[@]}"
         if [ "${{ inputs.increment }}" = "true" ]; then
           GRAPH_COMPARE_OUTPUT="$PUBLIC_DIR/graph_compare_log.txt"
           GRAPH_COMPARE_OUTPUT_URL="$PUBLIC_DIR_URL/graph_compare_log.txt"
 
           set +e
-          ./.github/scripts/graph_compare.py $ORIGINAL_HEAD~1 $ORIGINAL_HEAD |& tee $GRAPH_COMPARE_OUTPUT
+          ./.github/scripts/graph_compare.py --ya-make-command "./ya make ${params[@]}" --result-graph-path graph.json --result-context-path context.json $ORIGINAL_HEAD~1 $ORIGINAL_HEAD |& tee $GRAPH_COMPARE_OUTPUT
           RC=${PIPESTATUS[0]}
           set -e
 
@@ -271,7 +270,7 @@ runs:
           fi
 
           git checkout $ORIGINAL_HEAD
-          YA_MAKE_TARGET=.
+          YA_MAKE_TARGET="--build-custom-json graph.json --custom-context context.json"
         else
           YA_MAKE_TARGET=""
           for TARGET in ${{ inputs.build_target }}; do
@@ -297,8 +296,6 @@ runs:
           params+=(--retest)
         fi
 
-        export YA_MAKE_COMMAND="./ya make ${params[@]}"
-
         YA_MAKE_OUT_DIR=$TMP_DIR/out
 
         YA_MAKE_OUTPUT="$PUBLIC_DIR/ya_make_output.txt"
@@ -369,7 +366,7 @@ runs:
           MONITOR_PID=$!
 
           set +e
-          ($YA_MAKE_COMMAND $YA_MAKE_TARGET \
+          (./ya make ${params[@]} $YA_MAKE_TARGET \
             $RERUN_FAILED_OPT --log-file "$PUBLIC_DIR/ya_log.txt"  \
             --evlog-file "$CURRENT_PUBLIC_DIR/ya_evlog.jsonl" \
             --junit "$CURRENT_JUNIT_XML_PATH" --build-results-report "$CURRENT_REPORT" --output "$YA_MAKE_OUT_DIR"; echo $? > exit_code) |& cat >> $YA_MAKE_OUTPUT

.github/scripts/graph_compare.py

@@ -6,8 +6,8 @@
 
 import os
 import tempfile
-import sys
 import json
+import argparse
 
 
 def exec(command: str):
@@ -22,77 +22,40 @@ def log(msg: str):
     print(msg)
 
 
-def do_compare():
-    if len(sys.argv) < 3:
-        print('base or head commit not set')
-        exit(1)
-    base_commit = sys.argv[1]
-    head_commit = sys.argv[2]
-
-    ya_make_command = os.getenv('YA_MAKE_COMMAND')
-    if not ya_make_command:
-        print('YA_MAKE_COMMAND not set')
+def do_compare(opts):
+    if opts.ya_make_command:
+        print('--ya-make-command not set')
         exit(1)
+    ya = opts.ya_make_command.split(' ')[0]
 
     workdir = os.getenv('workdir')
     if not workdir:
         workdir = tempfile.mkdtemp()
 
     log(f'Workdir: {workdir}')
     log('Checkout base commit...')
-    exec(f'git checkout {base_commit}')
+    exec(f'git checkout {opts.base_commit}')
     log('Build graph for base commit...')
-    exec(f'{ya_make_command} ydb -k -A --cache-tests -Gj0 > {workdir}/graph_base.json')
+    exec(f'{opts.ya_make_command} ydb -k --cache-tests --save-graph-to {workdir}/graph_base.json --save-context-to {workdir}/context_base.json')
 
     log('Checkout head commit...')
-    exec(f'git checkout {head_commit}')
+    exec(f'git checkout {opts.head_commit}')
     log('Build graph for head commit...')
-    exec(f'{ya_make_command} ydb -k -A --cache-tests -Gj0 > {workdir}/graph_head.json')
+    exec(f'{opts.ya_make_command} ydb -k --cache-tests --save-graph-to {workdir}/graph_head.json --save-context-to {workdir}/context_head.json')
 
     log('Generate diff graph...')
-    exec(f'./ya tool ygdiff --old {workdir}/graph_base.json --new {workdir}/graph_head.json --cut {workdir}/graph_diff.json --dump-uids-for-affected-nodes {workdir}/affected_uids.json')
-
-    log('Read diff graph...')
-    with open(f'{workdir}/graph_diff.json', 'r') as f:
-        diff_graph = json.load(f)
-
-    with open(f'{workdir}/affected_uids.json', 'r') as f:
-        uids = set(json.load(f))
-
-    tests = set()
-    modules = set()
-
-    log('Scan diff graph...')
-    for target in diff_graph.get('graph', []):
-        if target.get('uid') not in uids:
-            continue
-        if target.get('node-type') == 'test':
-            path = target.get('kv', {}).get('path')
-            if path is not None:
-                tests.add(os.path.dirname(path))
-        tp = target.get('target_properties')
-        if (
-            tp is not None
-            and tp.get('module_type') is not None
-            and tp.get('module_dir', '').startswith('ydb')
-            and tp.get('module_tag', '').find('proto') < 0
-        ):
-            modules.add(tp.get('module_dir'))
-
-    log('Create ya.make')
+    exec(f'{ya} tool ygdiff --old {workdir}/graph_base.json --new {workdir}/graph_head.json --cut {opts.result_graph_path} --dump-uids {workdir}/uids.json')
 
-    with open('ya.make', 'w') as ya_make:
-        ya_make.write('RECURSE_FOR_TESTS(\n')
-        for test in sorted(tests):
-            ya_make.write(f'    {test}\n')
-        ya_make.write(')\n\nRECURSE (\n')
-        for module in sorted(modules):
-            ya_make.write(f'    {module}\n')
-        ya_make.write(')\n')
-    log('ya.make content:')
-    exec('cat ya.make')
+    log('Generate diff context...')
+    exec(f'{ya} tool context_difference {workdir}/context_base.json {workdir}/context_head.json {opts.result_context_path} {workdir}/uids.json {opts.result_graph_path}')
     exit(0)
 
 
 if __name__ == '__main__':
-    do_compare()
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--result-graph-path', '-g', type=str, help='Path for result graph', dest='graph_path', required=True)
+    parser.add_argument('--result-context-path', '-c', type=str, help='Path for result context', dest='context_path', required=True)
+    parser.add_argument('--ya-make-command', '-y', type=str, help='Ya make command', dest='ya_make_command', required=True)
+    parser.add_argument(dest='base_commit', help='Base commit')
+    parser.add_argument(dest='head_commit', help='Head commit')
+    do_compare(parser.parse_args())