Fix GH Actions & CircleCI workflows (#2774)

Summary: Fixes both the workflows Pull Request resolved: #2774 Test Plan: Verified on Github. All workflows are green. Reviewed By: kartavya-ramnani Differential Revision: D58090329 Pulled By: steelrooter fbshipit-source-id: 3917cb1c3265efed217550d30b566b592a0d4704
facebook · Jun 3, 2024 · 0f9de6c · 0f9de6c
1 parent b61c447
commit 0f9de6c
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 24 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,14 +5,16 @@
 #
 version: 2.1
 orbs:
-  android: circleci/android@2.2.0
+  android: circleci/android@2.5.0
 
 commands:
   run-tests:
     steps:
       - run:
           name: Run Tests
-          command: ./gradlew test assembleDebug -PdisablePreDex
+          command: |
+            export JAVA_HOME="/usr/lib/jvm/java-17-openjdk-amd64"
+            ./gradlew test assembleDebug -PdisablePreDex --info
   run-instrumentation-tests:
     steps:
       - run:
@@ -26,6 +28,28 @@ commands:
           command: |
             mkdir -p /home/circleci/test-results/junit
             find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} /home/circleci/test-results/junit \;
+  setup-jdk-17:
+    steps:
+      - run:
+          name: Install OpenJDK 17
+          command: |
+            sudo apt-get update && sudo apt-get install openjdk-17-jdk
+            sudo update-alternatives --set java /usr/lib/jvm/java-17-openjdk-amd64/bin/java
+            sudo update-alternatives --set javac /usr/lib/jvm/java-17-openjdk-amd64/bin/javac
+            java -version
+            echo "Previous JAVA_HOME:"
+            echo $JAVA_HOME
+            export JAVA_HOME="/usr/lib/jvm/java-17-openjdk-amd64"
+            echo "New JAVA_HOME:"
+            echo $JAVA_HOME
+  print-debug-info:
+    steps:
+      - run:
+          name: Print debug info
+          command: |
+            export JAVA_HOME="/usr/lib/jvm/java-17-openjdk-amd64"
+            echo "Printing Gradle Wrapper version"
+            ./gradlew --version
 
 jobs:
   build:
@@ -37,18 +61,11 @@ jobs:
       resource-class: large
     steps:
       - checkout
+      - setup-jdk-17
       - android/accept-licenses
       - android/restore-gradle-cache:
           cache-prefix: v1a
-      - android/create-avd:
-          avd-name: testAVD
-          install: true
-          system-image: system-images;android-29;default;x86
-      - android/start-emulator:
-          avd-name: testAVD
-          no-window: true
-          restore-gradle-cache-prefix: v1a
-      - android/wait-for-emulator
+      - print-debug-info
       - run-tests
       - android/save-gradle-cache:
           cache-prefix: v1a

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,6 +3,9 @@ on:
   push:
     branches:
     - main
+  pull_request:
+    branches:
+    - main
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -23,8 +26,8 @@ jobs:
       run: ./gradlew test assembleDebug -PdisablePreDex
     - name: Copy Results
       run: |
-        mkdir -p /home/gh_actions/test-results/junit
-        find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} /home/gh_actions/test-results/junit \;
+        mkdir -p ./gh_actions/test-results/junit
+        find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} ./gh_actions/test-results/junit \;
     - uses: actions/upload-artifact@v4.0.0
       with:
-        path: "/home/gh_actions/test-results"
+        path: "./gh_actions/test-results"
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
@@ -6,5 +6,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: actions/checkout@v4
+      - uses: gradle/actions/wrapper-validation@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,18 +16,23 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: set up JDK
-      uses: actions/setup-java@v1
+    - uses: actions/checkout@v4
+    - name: Install JDK
+      uses: actions/setup-java@v4
       with:
-        java-version: 11
-        distribution: 'zulu'
+        distribution: 'temurin'
+        java-version: |
+          11
+          17
+        cache: gradle
     - name: Setup Android SDK
-      uses: android-actions/setup-android@v2
+      uses: android-actions/setup-android@v3
     - name: Install NDK
-      run: echo "y" | sudo /usr/local/lib/android/sdk/tools/bin/sdkmanager --install "ndk;25.0.8775105" --sdk_root=${ANDROID_SDK_ROOT}
+    - uses: nttld/setup-ndk@v1
+      with:
+        ndk-version: r25c
     - name: Register NDK
-      run: "echo 'ndk.path=/usr/local/lib/android/sdk/ndk/25.0.8775105/' >> local.properties"
+      run: "echo 'ndk.path=/usr/local/lib/android/sdk/ndk/25.2.9519653' >> local.properties"
     - name: Write GPG Sec Ring
       run: echo '${{ secrets.GPG_KEY_CONTENTS }}' | base64 -d > /tmp/secring.gpg
     - name: Update gradle.properties