From 8f0ef274a8337e1d4c49ca2f0a634905163d2d9a Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Mon, 7 Nov 2022 10:39:18 +0100
Subject: [PATCH 1/2] ci: docker prune images before and after test

---
 .github/workflows/build_slim_packages.yaml | 4 ++++
 .github/workflows/run_test_cases.yaml      | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/.github/workflows/build_slim_packages.yaml b/.github/workflows/build_slim_packages.yaml
index 0f1466606..c542e0197 100644
--- a/.github/workflows/build_slim_packages.yaml
+++ b/.github/workflows/build_slim_packages.yaml
@@ -9,6 +9,7 @@ jobs:
     runs-on: ${{ matrix.runs-on }}
 
     strategy:
+      fail-fast: false
       matrix:
         otp:
           - erl23.3.4.9-3
@@ -29,6 +30,9 @@ jobs:
     container: emqx/build-env:${{ matrix.otp }}-${{ matrix.os }}
 
     steps:
+    - uses: AutoModality/action-clean@v1
+      # keep using v1 for now as the otp-23 image has an old version git
+      # TODO: change to v3 after OTP is upgraded to 23.3.4.18-1
     - uses: actions/checkout@v1
     - name: fix-git-unsafe-repository
       run: git config --global --add safe.directory /__w/emqx/emqx
diff --git a/.github/workflows/run_test_cases.yaml b/.github/workflows/run_test_cases.yaml
index 6f68469c3..04045ac42 100644
--- a/.github/workflows/run_test_cases.yaml
+++ b/.github/workflows/run_test_cases.yaml
@@ -150,6 +150,7 @@ jobs:
         run: |
           docker rm -f $(docker ps -qa) || true
           docker network rm $(docker network ls -q) || true
+          docker system prune --volumes -f
       - name: docker compose up
         working-directory: source
         env:
@@ -221,6 +222,11 @@ jobs:
       - name: set log file name
         if: failure()
         run: echo "LOGFILENAME=logs-$(echo ${{ matrix.app_name }} | tr '/' '_')" >> $GITHUB_ENV
+      - name: stop containers
+        run: |
+          docker rm -f $(docker ps -qa) || true
+          docker network rm $(docker network ls -q) || true
+          docker system prune --volumes -f
       - uses: actions/upload-artifact@v3
         if: failure()
         with:

From a432312b91d4124cb2477bca68ff085f72a04ed8 Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Mon, 7 Nov 2022 12:44:32 +0100
Subject: [PATCH 2/2] build: print apps in lines (but not as space separated
 args)

---
 scripts/find-apps.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/find-apps.sh b/scripts/find-apps.sh
index 9ed84273a..96073c6b4 100755
--- a/scripts/find-apps.sh
+++ b/scripts/find-apps.sh
@@ -87,5 +87,5 @@ fi
 if [ "$WANT_JSON" = 'yes' ]; then
     echo "${RESULT}" | xargs | tr -d '\n' | jq -R -s -c 'split(" ")'
 else
-    echo "${RESULT}" | xargs
+    echo "${RESULT}"
 fi