Merge branch 'master' into ci/tests_refactor

Author: lucasssvaz

.github/workflows/tests.yml

@@ -96,11 +96,12 @@ jobs:
   # call-qemu-tests:
   #   uses: ./.github/workflows/qemu.yml@master
   #   needs: [gen-matrix, call-build-tests]
-  # strategy:
-  #   fail-fast: false
-  #   matrix:
-  #     type: ${{ fromJson(needs.gen-matrix.outputs.qemu-types) }}
-  #     chip: ['esp32', 'esp32c3']
+  #   if: false
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       type: ${{ fromJson(needs.gen-matrix.outputs.qemu-types) }}
+  #       chip: ['esp32', 'esp32c3']
   #   with:
   #     type: ${{ matrix.type }}
   #     chip: ${{ matrix.chip }}
@@ -129,6 +130,8 @@ jobs:
             const sleep = ms => new Promise(r => setTimeout(r, ms));
             const sha = '${{ github.event.pull_request.head.sha || github.sha }}';
             const pr = '${{ github.event.pull_request.number }}';
+            const ref = '${{ github.event.pull_request.number || github.ref }}';
+            const regex = new RegExp("^tests-[\w]+-"+ref+"-", "m");
 
             console.log(`PR: ${pr}, SHA: ${sha}`);
 
@@ -142,12 +145,12 @@ jobs:
             }).then(caches => {
               if (caches) {
                 for (const cache of caches) {
-                  if (cache.key.endsWith(sha) || (!pr && !cache.key.startsWith("tests-bin-"))) {
+                  if (cache.key.endsWith(sha) || !regex.test(cache.key) || (!pr && !cache.key.startsWith("tests-bin-"))) {
                     console.log(`Skipping cache with key: ${cache.key}`);
                     continue;
                   }
 
-                  console.log(`Deleting cache with key: ${cache.key}`);
+                  console.log(`Deleting cache: ${cache.key}`);
 
                   /*
                   github.rest.actions.deleteActionsCacheById({