From 8ed080fed18e3e8b2262db44b19695769a3dd234 Mon Sep 17 00:00:00 2001
From: Tomas Rezucha <tomas.rezucha@espressif.com>
Date: Mon, 9 May 2022 16:31:04 +0200
Subject: [PATCH 1/2] Revert "Create dependabot.yml"

This reverts commit 73437887dad8d95833977807cba9e05c26358f28.

Related to https://github.com/espressif/idf-extra-components/issues/29
---
 .github/dependabot.yml | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
deleted file mode 100644
index fb0e272..0000000
--- a/.github/dependabot.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "gitsubmodule"
-    directory: "/"
-    schedule:
-      interval: "weekly"

From 0fbc1ac89fa012a033f3a453844ee5f45346614f Mon Sep 17 00:00:00 2001
From: Tomas Rezucha <tomas.rezucha@espressif.com>
Date: Mon, 9 May 2022 17:02:47 +0200
Subject: [PATCH 2/2] ci: Update testing CI for pytest-embedded v0.7.0

---
 .github/workflows/build_and_run_test_app.yml | 21 +++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build_and_run_test_app.yml b/.github/workflows/build_and_run_test_app.yml
index b0585ef..b6b963b 100644
--- a/.github/workflows/build_and_run_test_app.yml
+++ b/.github/workflows/build_and_run_test_app.yml
@@ -31,16 +31,15 @@ jobs:
         run: |
           . ${IDF_PATH}/export.sh
           idf.py build
-      - name: Merge binaries
-        shell: bash
-        working-directory: test_app/build
-        run: |
-          . ${IDF_PATH}/export.sh
-          esptool.py --chip ${{ matrix.idf_target }} merge_bin --fill-flash-size 4MB -o flash_image.bin @flash_args
       - uses: actions/upload-artifact@v2
         with:
           name: test_app_bin_${{ matrix.idf_target }}_${{ matrix.idf_ver }}
-          path: test_app/build/flash_image.bin
+          path: |
+            test_app/build/bootloader/bootloader.bin
+            test_app/build/partition_table/partition-table.bin
+            test_app/build/idf_extra_test_app.bin
+            test_app/build/idf_extra_test_app.elf
+            test_app/build/flasher_args.json
 
   # Keeping this here for future reference. QEMU tests are not passing now
   #run-qemu:
@@ -87,19 +86,17 @@ jobs:
       - name: Install Python packages
         env:
           PIP_EXTRA_INDEX_URL: "https://www.piwheels.org/simple"
-        run: pip install esptool pytest-embedded==0.6.0rc0 pytest-embedded-serial-esp==0.6.0rc0
-      - name: Download Test App to target
-        run: python -m esptool --chip ${{ matrix.idf_target }} write_flash 0x0 test_app/build/flash_image.bin
+        run: pip install pytest-embedded pytest-embedded-serial-esp pytest-embedded-idf
       - name: Run Test App on target
         working-directory: test_app
-        run: pytest -s --junit-xml=./test_app_results_${{ matrix.idf_target }}_${{ matrix.idf_ver }}.xml --embedded-services esp --target=${{ matrix.idf_target }}
+        run: pytest -s --junit-xml=./test_app_results_${{ matrix.idf_target }}_${{ matrix.idf_ver }}.xml --embedded-services esp,idf --target=${{ matrix.idf_target }}
       - uses: actions/upload-artifact@v2
         if: always()
         with:
           name: test_app_results_${{ matrix.idf_target }}_${{ matrix.idf_ver }}
           path: test_app/*.xml
 
-  publish-results:
+  publish-results: # @todo fix this for public forks
     name: Publish Test App results
     needs: run-target
     if: always() # Run even if the previous step failed