From 48a987e12ce65a3bd27eaeb3e60bb2655e1deb1a Mon Sep 17 00:00:00 2001
From: Gokhan Gulbiz <ggulbiz@gmail.com>
Date: Wed, 16 Aug 2023 18:12:38 +0300
Subject: [PATCH] Reorganize upload artifact folder structure

---
 .../actions/save_logs_and_results/action.yml  | 34 +++++++++++--------
 .github/actions/save_regressions/action.yml   | 10 ++++--
 .github/workflows/flaky_test_debugging.yml    |  4 +++
 3 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/.github/actions/save_logs_and_results/action.yml b/.github/actions/save_logs_and_results/action.yml
index ad37a7a0f..305e018ac 100644
--- a/.github/actions/save_logs_and_results/action.yml
+++ b/.github/actions/save_logs_and_results/action.yml
@@ -1,54 +1,58 @@
 name: save_logs_and_results
+inputs:
+  folder:
+    required: false
+    default: ""
 runs:
   using: composite
   steps:
   - uses: actions/upload-artifact@v3.1.1
-    if: ${{ matrix.id == '' }}
+    if: ${{ inputs.folder == '' }}
     with:
       name: proxy.output
       path: src/test/regress/proxy.output
   - uses: actions/upload-artifact@v3.1.1
-    if: ${{ matrix.id == '' }}
+    if: ${{ inputs.folder == '' }}
     with:
       name: regress
       path: src/test/regress/results/
   - uses: actions/upload-artifact@v3.1.1
-    if: ${{ matrix.id == '' }}
+    if: ${{ inputs.folder == '' }}
     with:
       name: master.log
       path: src/test/regress/tmp_check/master/log
   - uses: actions/upload-artifact@v3.1.1
-    if: ${{ matrix.id == '' }}
+    if: ${{ inputs.folder == '' }}
     with:
       name: worker.57637.log
       path: src/test/regress/tmp_check/worker.57637/log
   - uses: actions/upload-artifact@v3.1.1
-    if: ${{ matrix.id == '' }}
+    if: ${{ inputs.folder == '' }}
     with:
       name: worker.57638.log
       path: src/test/regress/tmp_check/worker.57638/log
   - uses: actions/upload-artifact@v3.1.1
-    if: ${{ matrix.id != '' }}
+    if: ${{ inputs.folder != '' }}
     with:
-      name: proxy_${{ matrix.id }}.output
+      name: ${{ inputs.folder }}/proxy.output
       path: src/test/regress/proxy.output
   - uses: actions/upload-artifact@v3.1.1
-    if: ${{ matrix.id != '' }}
+    if: ${{ inputs.folder != '' }}
     with:
-      name: regress_${{ matrix.id }}
+      name: ${{ inputs.folder }}/regress
       path: src/test/regress/results/
   - uses: actions/upload-artifact@v3.1.1
-    if: ${{ matrix.id != '' }}
+    if: ${{ inputs.folder != '' }}
     with:
-      name: master_${{ matrix.id }}.log
+      name: ${{ inputs.folder }}/master.log
       path: src/test/regress/tmp_check/master/log
   - uses: actions/upload-artifact@v3.1.1
-    if: ${{ matrix.id != '' }}
+    if: ${{ inputs.folder != '' }}
     with:
-      name: worker_${{ matrix.id }}.57637.log
+      name: ${{ inputs.folder }}/worker.57637.log
       path: src/test/regress/tmp_check/worker.57637/log
   - uses: actions/upload-artifact@v3.1.1
-    if: ${{ matrix.id != '' }}
+    if: ${{ inputs.folder != '' }}
     with:
-      name: worker_${{ matrix.id }}.57638.log
+      name: ${{ inputs.folder }}/worker.57638.log
       path: src/test/regress/tmp_check/worker.57638/log
diff --git a/.github/actions/save_regressions/action.yml b/.github/actions/save_regressions/action.yml
index 718cbffc4..f69b46a2d 100644
--- a/.github/actions/save_regressions/action.yml
+++ b/.github/actions/save_regressions/action.yml
@@ -1,4 +1,8 @@
 name: save_regressions
+inputs:
+  folder:
+    required: false
+    default: ""
 runs:
   using: composite
   steps:
@@ -11,12 +15,12 @@ runs:
     if: failure()
     shell: bash
   - uses: actions/upload-artifact@v3.1.1
-    if: ${{ matrix.id == '' }}
+    if: ${{ inputs.folder == '' }}
     with:
       name: regression.diffs
       path: src/test/regress/regression.diffs
   - uses: actions/upload-artifact@v3.1.1
-    if: ${{ matrix.id != '' }}
+    if: ${{ inputs.folder != '' }}
     with:
       path: src/test/regress/regression.diffs
-      name: regression_${{ matrix.id }}.diffs
+      name: ${{ inputs.folder }}/regression.diffs
diff --git a/.github/workflows/flaky_test_debugging.yml b/.github/workflows/flaky_test_debugging.yml
index 5b091cd33..2b8afc397 100644
--- a/.github/workflows/flaky_test_debugging.yml
+++ b/.github/workflows/flaky_test_debugging.yml
@@ -119,7 +119,11 @@ jobs:
       shell: bash
     - uses: "./.github/actions/save_logs_and_results"
       if: always()
+      with:
+          folder: ${{ matrix.id }}
     - uses: "./.github/actions/save_regressions"
       if: always()
+      with:
+          folder: ${{ matrix.id }}
     - uses: "./.github/actions/stack_trace"
       if: always()