Revert "ci: CI changes to pre-test PR#372 (alvr-org#379)"

This reverts commit a239be0.
ShootingKing-AM · Sep 10, 2024 · 344ce0b · 344ce0b
1 parent 750757a
commit 344ce0b
Showing 1 changed file with 16 additions and 79 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -152,81 +152,45 @@ jobs:
           ls -alh
           cd code/mobile/android/PhoneVR
           chmod +x prepare-alvr-deps.sh
-          bash prepare-alvr-deps.sh nogvr
+          bash prepare-alvr-deps.sh
       
       - name: Change gradle wrapper permissions
         run: |
           cd code/mobile/android/PhoneVR
           chmod +x ./gradlew
           ls -alh
           ls -alh app
-      
-      # Create APK Debug
-      - name: Build apk noGvr debug project (APK)
-        run:  |
-          cd code/mobile/android/PhoneVR
-          ./gradlew :${{ env.MAIN_PROJECT_MODULE }}:assembleNoGvrDebug --warning-mode=all --stacktrace -Dorg.gradle.java.home=${{env.JAVA_HOME}}
-
-      # Create APK Release
-      - name: Build apk noGvr release project (APK)
-        env:
-          Key: ${{ secrets.KEY }}
-          Store: ${{ secrets.STORE }}
-        run:  |
-          cd code/mobile/android/PhoneVR
-          ./gradlew :${{ env.MAIN_PROJECT_MODULE }}:assembleNoGvrRelease --warning-mode=all --stacktrace -Dorg.gradle.java.home=${{env.JAVA_HOME}}
 
-      - name: Prepare deps
-        run: |          
-          ls -alh
-          cd code/mobile/android/PhoneVR
-          chmod +x prepare-alvr-deps.sh
-          bash prepare-alvr-deps.sh
-      
       # Create APK Debug
-      - name: Build apk gvr debug project (APK)
+      - name: Build apk debug project (APK)
         run:  |
           cd code/mobile/android/PhoneVR
-          ./gradlew :${{ env.MAIN_PROJECT_MODULE }}:assembleGvrDebug --warning-mode=all --stacktrace -Dorg.gradle.java.home=${{env.JAVA_HOME}}
+          ./gradlew :${{ env.MAIN_PROJECT_MODULE }}:assembleDebug --warning-mode=all --stacktrace -Dorg.gradle.java.home=${{env.JAVA_HOME}}
 
       # Create APK Release
-      - name: Build apk gvr release project (APK)
+      - name: Build apk release project (APK)
         env:
           Key: ${{ secrets.KEY }}
           Store: ${{ secrets.STORE }}
         run:  |
           cd code/mobile/android/PhoneVR
-          ./gradlew :${{ env.MAIN_PROJECT_MODULE }}:assembleGvrRelease --warning-mode=all --stacktrace -Dorg.gradle.java.home=${{env.JAVA_HOME}}
+          ./gradlew :${{ env.MAIN_PROJECT_MODULE }}:assemble --warning-mode=all --stacktrace -Dorg.gradle.java.home=${{env.JAVA_HOME}}
 
       # Upload Artifact Build
-      # Noted For Output [MAIN_PROJECT_MODULE]/build/outputs/apk/gvr/debug/
+      # Noted For Output [MAIN_PROJECT_MODULE]/build/outputs/apk/debug/
       - name: Upload APK Debug
         uses: actions/upload-artifact@v2
         with:
           name: ${{ env.PROJECT_NAME }}-debug-${{ steps.vars.outputs.sha_short }}-${{ env.date_today }} APK
-          path: ${{env.GRADLE_DIR}}/${{ env.MAIN_PROJECT_MODULE }}/build/outputs/apk/gvr/debug/
+          path: ${{env.GRADLE_DIR}}/${{ env.MAIN_PROJECT_MODULE }}/build/outputs/apk/debug/
 
-      # Noted For Output [MAIN_PROJECT_MODULE]/build/outputs/apk/gvr/release/
+      # Noted For Output [MAIN_PROJECT_MODULE]/build/outputs/apk/release/
       - name: Upload APK Release
         uses: actions/upload-artifact@v2
         with:
           name: ${{ env.PROJECT_NAME }}-${{ steps.vars.outputs.sha_short }}-${{ env.date_today }} APK
-          path: ${{env.GRADLE_DIR}}/${{ env.MAIN_PROJECT_MODULE }}/build/outputs/apk/gvr/release/
+          path: ${{env.GRADLE_DIR}}/${{ env.MAIN_PROJECT_MODULE }}/build/outputs/apk/release/
 
-      # Noted For Output [MAIN_PROJECT_MODULE]/build/outputs/apk/noGvr/debug/
-      - name: Upload APK Debug
-        uses: actions/upload-artifact@v2
-        with:
-          name: ${{ env.PROJECT_NAME }}-debug-${{ steps.vars.outputs.sha_short }}-${{ env.date_today }} APK
-          path: ${{env.GRADLE_DIR}}/${{ env.MAIN_PROJECT_MODULE }}/build/outputs/apk/noGvr/debug/
-
-      # Noted For Output [MAIN_PROJECT_MODULE]/build/outputs/apk/noGvr/release/
-      - name: Upload APK Release
-        uses: actions/upload-artifact@v2
-        with:
-          name: ${{ env.PROJECT_NAME }}-${{ steps.vars.outputs.sha_short }}-${{ env.date_today }} APK
-          path: ${{env.GRADLE_DIR}}/${{ env.MAIN_PROJECT_MODULE }}/build/outputs/apk/noGvr/release/
-
       - name: Upload Build outputs on failure
         if: failure()
         uses: actions/upload-artifact@v2
@@ -420,14 +384,13 @@ jobs:
             echo "shutdown meow !" >> pvr-adb-telnet.sd
             cat log.txt
 
-      # build/outputs/connected_android_test_additional_output/gvrDebugAndroidTest/connected/GPlay_Pixel_2_API_30(AVD) - 11/ALVRActivityTest_saveDeviceScreenBitmap.png
+      # build/outputs/connected_android_test_additional_output/debugAndroidTest/connected/GPlay_Pixel_2_API_30(AVD) - 11/ALVRActivityTest_saveDeviceScreenBitmap.png
       - uses: actions/upload-artifact@v3
         if: always()
         with:
           name: Test results
           path: |
-            **/app/build/outputs/connected_android_test_additional_output/gvrDebugAndroidTest/connected/*
-            **/app/build/outputs/connected_android_test_additional_output/noGvrDebugAndroidTest/connected/*
+            **/app/build/outputs/connected_android_test_additional_output/debugAndroidTest/connected/*
             **/app/build/reports
             **/app/build/test-results
             **/app/build/outputs/androidTest-results
@@ -511,48 +474,22 @@ jobs:
           echo "" >> comment.md
 
           # ls -alh
-          # ls -alh app/build/outputs/connected_android_test_additional_output/gvrDebugAndroidTest/connected/
-          # stat 'app/build/outputs/connected_android_test_additional_output/gvrDebugAndroidTest/connected/Pixel_2(AVD) - 11/InitActivityTest_saveDeviceScreenBitmap.png'
+          # ls -alh app/build/outputs/connected_android_test_additional_output/debugAndroidTest/connected/
+          # stat 'app/build/outputs/connected_android_test_additional_output/debugAndroidTest/connected/Pixel_2(AVD) - 11/InitActivityTest_saveDeviceScreenBitmap.png'
 
           # for each AVD Image
-          for ss_test_avd in app/build/outputs/connected_android_test_additional_output/gvrDebugAndroidTest/connected/*; do 
-
-            ls -alh "$ss_test_avd"
-            echo "$ss_test_avd"
-            ss_test_avd_desc=$(basename "$ss_test_avd")
-
-            echo "" >> comment.md
-            echo "### 📱gvr: $ss_test_avd_desc" >> comment.md
-            echo "" >> comment.md
-
-            # for each .png in that AVD folder
-            for ss_test in "app/build/outputs/connected_android_test_additional_output/gvrDebugAndroidTest/connected/$ss_test_avd_desc/"*.png; do 
-              
-              ss_test_desc=$(basename "$ss_test" .png)
-              
-              echo "" >> comment.md
-              echo "#### 🔧 $ss_test_desc" >> comment.md
-              echo "" >> comment.md
-
-              echo "$WK_DIR + / + $ss_test"
-              echo '<p float="left">' >> comment.md
-              cml-publish "$ss_test" | gsed -E 's/.+/<img width="70%" src="\0"\/>/' >> comment.md
-              echo '</p>' >> comment.md
-
-            done
-          done
-          for ss_test_avd in app/build/outputs/connected_android_test_additional_output/noGvrDebugAndroidTest/connected/*; do 
+          for ss_test_avd in app/build/outputs/connected_android_test_additional_output/debugAndroidTest/connected/*; do 
 
             ls -alh "$ss_test_avd"
             echo "$ss_test_avd"
             ss_test_avd_desc=$(basename "$ss_test_avd")
 
             echo "" >> comment.md
-            echo "### 📱noGvr: $ss_test_avd_desc" >> comment.md
+            echo "### 📱 $ss_test_avd_desc" >> comment.md
             echo "" >> comment.md
 
             # for each .png in that AVD folder
-            for ss_test in "app/build/outputs/connected_android_test_additional_output/noGvrDebugAndroidTest/connected/$ss_test_avd_desc/"*.png; do 
+            for ss_test in "app/build/outputs/connected_android_test_additional_output/debugAndroidTest/connected/$ss_test_avd_desc/"*.png; do 
               
               ss_test_desc=$(basename "$ss_test" .png)