From 057ca8ba0d4f899c2e5b614b663d140dbd72456d Mon Sep 17 00:00:00 2001
From: Shawn Kuang <chkuang@google.com>
Date: Mon, 21 Aug 2023 15:45:19 -0700
Subject: [PATCH] incremental change

---
 .github/workflows/test.yaml | 100 ++++++++++++++----------------------
 1 file changed, 38 insertions(+), 62 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 7c5ee390..d5894d5f 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -19,77 +19,53 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - id: create_files
+      - name: Obtain Failed tests
+        if: always()
         shell: bash
         run: |
-          mkdir -p test_output/testFoo/
-          mkdir -p test_output/testBar/
-
-          echo "Test TestFoo1: PASSED" >> test_output/testFoo/TestFoo_test.log
-          echo "Test TestFoo2: SKIPPED" >> test_output/testFoo/TestFoo_test.log
-          echo "Test TestFoo3: FAILED" >> test_output/testFoo/TestFoo_test.log
-
-          echo "Test TestBar1: PASSED" >> test_output/testBar/TestBar_test.log
-          echo "Test TestBar2: SKIPPED" >> test_output/testBar/TestBar_test.log
-          echo "Test TestBar3: FAILED" >> test_output/testBar/TestBar_test.log
-
-      - run: cat test_output/test*/*_test.log | grep "^Test .* FAILED$"
-
-      - run: cat test_output/test*/*_test.log | grep "^Test .* PASSED$"
-
-      - run: cat test_output/test*/*_test.log | grep "^Test .* SKIPPED$"
-
-      - run: |
-          cat test_output/test*/*_test.log | grep "^Test .* IGNORED$"
           cat test_output/test*/*_test.log | grep "^Test .* FAILED$"
-        continue-on-error: true
-
-      # - name: Obtain Failed tests
-      #   if: always()
-      #   shell: bash
-      #   run: |
-      #     cat test_output/test*/*_test.log | grep "^Test .* FAILED$"
-      #     cat test_output/test*/*_test.log | grep "^Test .* PASSED$"
-      #     cat test_output/test*/*_test.log | grep "^Test .* SKIPPED$"
-
-      # - uses: actions/checkout@v3
+          cat test_output/test*/*_test.log | grep "^Test .* PASSED$"
+          cat test_output/test*/*_test.log | grep "^Test .* SKIPPED$"
 
-      # - id: build_setup
-      #   uses: ./gha/build_setup
-      #   timeout-minutes: 30
-      #   with:
-      #     unity_version: ${{ inputs.unity_version }}
-      #     platform: macOS
-      #     python_version: ${{ env.pythonVersion }}
-      #     unity_username: ${{ secrets.UNITY_USERNAME }}
-      #     unity_password: ${{ secrets.UNITY_PASSWORD }}
-      #     unity_serial_id: ${{ secrets.SERIAL_ID }}
+      - uses: actions/checkout@v3
 
-      # - name: Set Unity Env for EDM4U build script
-      #   shell: bash
-      #   run: echo "UNITY_EXE=${{ env.UNITY_ROOT_DIR }}/Unity.app/Contents/MacOS/Unity" >> $GITHUB_ENV
+      - id: build_setup
+        uses: ./gha/build_setup
+        timeout-minutes: 30
+        with:
+          unity_version: ${{ inputs.unity_version }}
+          platform: macOS
+          python_version: ${{ env.pythonVersion }}
+          unity_username: ${{ secrets.UNITY_USERNAME }}
+          unity_password: ${{ secrets.UNITY_PASSWORD }}
+          unity_serial_id: ${{ secrets.SERIAL_ID }}
+
+      - name: Set Unity Env for EDM4U build script
+        shell: bash
+        run: echo "UNITY_EXE=${{ env.UNITY_ROOT_DIR }}/Unity.app/Contents/MacOS/Unity" >> $GITHUB_ENV
 
-      # - run: ./gradlew testAndroidResolverIntegrationTestsBatchMode --info
+      - run: ./gradlew testAndroidResolverIntegrationTestsBatchMode --info
 
-      # - name: Print test log
-      #   if: always()
-      #   shell: bash
-      #   run: cat test_output/testAndroidResolverIntegrationTestsBatchMode/*.log
+      - name: Print test log
+        if: always()
+        shell: bash
+        run: cat test_output/testAndroidResolverIntegrationTestsBatchMode/*.log
 
-      # - name: Obtain Failed tests
-      #   if: always()
-      #   shell: bash
-      #   run: |
-      #     cat test_output/test*/*_test.log | grep "^Test .* FAILED$"
-      #     cat test_output/test*/*_test.log | grep "^Test .* PASSED$"
-      #     cat test_output/test*/*_test.log | grep "^Test .* SKIPPED$"
+      - name: Obtain Failed tests
+        if: always()
+        shell: bash
+        continue-on-error: true
+        run: |
+          cat test_output/test*/*_test.log | grep "^Test .* FAILED$"
+          cat test_output/test*/*_test.log | grep "^Test .* PASSED$"
+          cat test_output/test*/*_test.log | grep "^Test .* SKIPPED$"
 
-      # - name: Return Unity license
-      #   if: always()
-      #   uses: firebase/firebase-unity-sdk/gha/unity@main
-      #   with:
-      #     version: ${{ inputs.unity_version }}
-      #     release_license: "true"
+      - name: Return Unity license
+        if: always()
+        uses: firebase/firebase-unity-sdk/gha/unity@main
+        with:
+          version: ${{ inputs.unity_version }}
+          release_license: "true"
 
       - name: Upload build logs
         uses: actions/upload-artifact@v3