Improve CI for Android artifacts (KhronosGroup#351)

nbykovsky · Nov 18, 2022 · f5e84ab · f5e84ab
1 parent 3637ac3
commit f5e84ab
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 19 deletions.
diff --git a/.github/workflows/android-helloxr-ci.yml b/.github/workflows/android-helloxr-ci.yml
@@ -13,17 +13,18 @@ jobs:
       - name: Install ninja-build tool
         uses: seanmiddleditch/gha-setup-ninja@v3
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3.6.0
         with:
           java-version: "11"
-          distribution: "adopt"
+          distribution: "temurin"
           cache: gradle
 
       # HelloXR OpenGLES version
       - name: Build HelloXR OpenGLES for Android
-        run: |
-          cd src/tests/hello_xr
-          ./gradlew assembleOpenGLESDebug
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: assembleOpenGLESDebug
+          build-root-directory: src/tests/hello_xr
       - name: Upload HelloXR OpenGLES Android
         uses: actions/upload-artifact@v2
         with:

diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml
@@ -15,11 +15,12 @@ jobs:
       - uses: actions/checkout@v2
       - name: Install ninja-build tool
         uses: seanmiddleditch/gha-setup-ninja@v3
+
       - name: set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3.6.0
         with:
           java-version: "11"
-          distribution: "adopt"
+          distribution: "temurin"
           cache: gradle
 
       - name: Build, sign, and publish AAR
@@ -54,17 +55,18 @@ jobs:
       - name: Install ninja-build tool
         uses: seanmiddleditch/gha-setup-ninja@v3
       - name: set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3.6.0
         with:
           java-version: "11"
-          distribution: "adopt"
+          distribution: "temurin"
           cache: gradle
 
       # HelloXR OpenGLES version
       - name: Build HelloXR OpenGLES for Android
-        run: |
-          cd src/tests/hello_xr
-          ./gradlew assembleOpenGLESRelease
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: assembleOpenGLESRelease
+          build-root-directory: src/tests/hello_xr
       - name: Sign HelloXR OpenGLES Android release
         uses: r0adkll/sign-android-release@349ebdef58775b1e0d8099458af0816dc79b6407
         id: sign_gles
@@ -76,17 +78,24 @@ jobs:
           keyPassword: ${{ secrets.APK_KEY_PASSWORD }}
         env:
           BUILD_TOOLS_VERSION: "30.0.3"
+
+      - name: Rename APK
+        env:
+          SIGNED_FILE: ${{ steps.sign_gles.outputs.signedReleaseFile }}
+        run: mv $SIGNED_FILE HelloXR_OpenGLES.apk
       - name: Upload HelloXR OpenGLES Android
         uses: actions/upload-artifact@v2
         with:
           name: HelloXR OpenGLES Android
-          path: ${{ steps.sign_gles.outputs.signedReleaseFile }}
+          path: HelloXR_OpenGLES.apk
 
       # HelloXR Vulkan version
       - name: Build HelloXR Vulkan for Android
-        run: |
-          cd src/tests/hello_xr
-          ./gradlew assembleVulkanRelease
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: assembleVulkanRelease
+          build-root-directory: src/tests/hello_xr
+
       - name: Sign HelloXR Vulkan Android release
         uses: r0adkll/sign-android-release@349ebdef58775b1e0d8099458af0816dc79b6407
         id: sign_vulkan
@@ -98,8 +107,20 @@ jobs:
           keyPassword: ${{ secrets.APK_KEY_PASSWORD }}
         env:
           BUILD_TOOLS_VERSION: "30.0.3"
+
+      - name: Rename APK
+        env:
+          SIGNED_FILE: ${{ steps.sign_vulkan.outputs.signedReleaseFile }}
+        run: mv $SIGNED_FILE HelloXR_Vulkan.apk
+
       - name: Upload HelloXR Vulkan Android
         uses: actions/upload-artifact@v2
         with:
           name: HelloXR Vulkan Android
-          path: ${{ steps.sign_vulkan.outputs.signedReleaseFile }}
+          path: HelloXR_Vulkan.apk
+
+      - name: Release
+        if: startsWith(github.ref, 'refs/tags/release-')
+        uses: softprops/action-gh-release@v1
+        with:
+          files: HelloXR_*.apk
diff --git a/.github/workflows/android-snapshot.yml b/.github/workflows/android-snapshot.yml
@@ -12,12 +12,14 @@ jobs:
       - uses: actions/checkout@v2
       - name: Install ninja-build tool
         uses: seanmiddleditch/gha-setup-ninja@v3
+
       - name: set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3.6.0
         with:
           java-version: "11"
-          distribution: "adopt"
+          distribution: "temurin"
           cache: gradle
+
       - name: Build, sign, and publish AAR
         run: ./maintainer-scripts/build-and-publish-aar-snapshot.sh
         env: