macos android ci(perf): don't use built in java

socketsupply · Apr 18, 2023 · c2aac2d · c2aac2d
1 parent c229b44
commit c2aac2d
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -170,13 +170,37 @@ jobs:
       with:
         ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
 
+    - name: Android FTE - test jh
+      run: |
+        ./bin/android-functions.sh --android-fte --yes-deps --test-jh
+      env:
+        VERBOSE: 1
+        NO_IOS: 1
+        CI: true
+        SSC_ANDROID_CI: true
+        ANDROID_SUPPORTED_ABIS: x86_64
+        JAVA_HOME: ""
+        NODE_AUTH_TOKEN: ${{ secrets.PACKAGE_PAT }}
+
+    - name: Android FTE
+      run: |
+        ./bin/android-functions.sh --android-fte --yes-deps
+      env:
+        VERBOSE: 1
+        DEBUG: 1
+        NO_IOS: 1
+        CI: true
+        SSC_ANDROID_CI: true
+        ANDROID_SUPPORTED_ABIS: x86_64
+        JAVA_HOME: ""
+        NODE_AUTH_TOKEN: ${{ secrets.PACKAGE_PAT }}
+
     - name: install Socket Runtime deps
       run: |
         brew install automake
 
     - name: Build Socket Runtime
       run: |
-        ./bin/android-functions.sh --android-fte --yes-deps
         ./bin/install.sh
         ./bin/ci_version_check.sh
       env:

diff --git a/bin/android-functions.sh b/bin/android-functions.sh
@@ -748,11 +748,15 @@ function android_fte() {
   local set_exit_code=""
 
   [[ -n "$android_fte" ]] && return 0
+  [[ "$CI" == "true" ]] && export JAVA_HOME=""
+
+  echo "JAVA_HOME: $JAVA_HOME"
 
   while (( $# > 0 )); do
     declare arg="$1"; shift
     [[ "$arg" == "--yes-deps" ]] && pass_yes_deps="$arg"
     [[ "$arg" == "--exit-code" ]] && set_exit_code="1"
+    [[ "$arg" == "--test-jh" ]] && exit 0
   done
 
   android_fte=1