fix(common): Fixed scripts for build test failure

espressif · Jan 15, 2024 · 469c745 · 469c745
1 parent 1393764
commit 469c745
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/console_cmd_ifconfig__build.yml b/.github/workflows/console_cmd_ifconfig__build.yml
@@ -29,4 +29,4 @@ jobs:
         run: |
           ${IDF_PATH}/install.sh --enable-pytest
           . ${IDF_PATH}/export.sh
-          python $IDF_PATH/tools/ci/ci_build_apps.py . --target ${{ matrix.idf_target }} -vv --preserve-all --pytest-app
+          python ../../../ci/build_apps.py ./ifconfig-basic --target ${{ matrix.idf_target }} -vv --preserve-all --pytest-app
diff --git a/.github/workflows/console_cmd_ping__build.yml b/.github/workflows/console_cmd_ping__build.yml
@@ -29,4 +29,4 @@ jobs:
         run: |
           ${IDF_PATH}/install.sh --enable-pytest
           . ${IDF_PATH}/export.sh
-          python $IDF_PATH/tools/ci/ci_build_apps.py . --target ${{ matrix.idf_target }} -vv --preserve-all --pytest-app
+          python ../../../ci/build_apps.py ./ping-basic --target ${{ matrix.idf_target }} -vv --preserve-all --pytest-app
diff --git a/.github/workflows/console_cmd_wifi__build.yml b/.github/workflows/console_cmd_wifi__build.yml
@@ -29,4 +29,4 @@ jobs:
         run: |
           ${IDF_PATH}/install.sh --enable-pytest
           . ${IDF_PATH}/export.sh
-          python $IDF_PATH/tools/ci/ci_build_apps.py . --target ${{ matrix.idf_target }} -vv --preserve-all --pytest-app
+          python ../../../ci/build_apps.py ./wifi-basic --target ${{ matrix.idf_target }} -vv --preserve-all --pytest-app
diff --git a/.github/workflows/console_simple_init__build.yml b/.github/workflows/console_simple_init__build.yml
@@ -29,4 +29,4 @@ jobs:
         run: |
           ${IDF_PATH}/install.sh --enable-pytest
           . ${IDF_PATH}/export.sh
-          python $IDF_PATH/tools/ci/ci_build_apps.py . --target ${{ matrix.idf_target }} -vv --preserve-all --pytest-app
+          python ../../../ci/build_apps.py ./console_basic --target ${{ matrix.idf_target }} -vv --preserve-all --pytest-app
diff --git a/ci/build_apps.py b/ci/build_apps.py
@@ -17,6 +17,12 @@
         formatter_class=argparse.ArgumentDefaultsHelpFormatter,
     )
     parser.add_argument('paths', nargs='+', help='Paths to the apps to build.')
+    parser.add_argument(
+        '-v',
+        '--verbose',
+        action='count',
+        help='Increase the LOGGER level of the script. Can be specified multiple times.',
+    )
     parser.add_argument(
         '-t',
         '--target',
@@ -28,6 +34,8 @@
     parser.add_argument('-d', '--delete', action='store_true', help='Delete build artifacts')
     parser.add_argument('-c', '--recursive', action='store_true', help='Build recursively')
     parser.add_argument('-l', '--linux', action='store_true', help='Include linux build (dont check warnings)')
+    parser.add_argument('--preserve-all', action='store_true', help='Preserve the binaries for all apps when specified.')
+    parser.add_argument('--pytest-apps', action='store_true', help='Only build apps required by pytest scripts.')
     args = parser.parse_args()
 
     IDF_PATH = os.environ['IDF_PATH']
@@ -47,8 +55,8 @@
         target=args.target,
         build_dir='build_@t_@w',
         config_rules_str=args.rules,
-        build_log_path='build_log.txt',
-        size_json_path='size.json' if not args.linux else None,
+        build_log_filename='build_log.txt',
+        size_json_filename='size.json' if not args.linux else None,
         check_warnings=True,
         preserve=not args.delete,
         manifest_files=args.manifests,