Merge branch 'hotfix/1.2.8'

mshdabiola · Jun 26, 2024 · 537e741 · 537e741
2 parents 9499c6d + d559dbe
commit 537e741
Show file tree

Hide file tree

Showing 4 changed files with 113 additions and 61 deletions.
diff --git a/.github/workflows/deploy_foss_to_github.yml b/.github/workflows/deploy_foss_to_github.yml
@@ -5,61 +5,57 @@ on:
     tags:
       - '[0-9]+.[0-9]+.[0-9]+'
 
-## 2
 jobs:
-  ## 3
   build:
     runs-on: ubuntu-latest
+    timeout-minutes: 120
+
     steps:
-      # 1
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          java-version: '17'
-      # 2
+      - name: Enable KVM group perms
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+          ls /dev/kvm
 
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
+      - name: Checkout
+        uses: actions/checkout@v4
 
-      - name: Setup build tool version variable
-        shell: bash
-        run: |
-          BUILD_TOOL_VERSION=$(ls /usr/local/lib/android/sdk/build-tools/ | tail -n 1)
-          echo "BUILD_TOOL_VERSION=$BUILD_TOOL_VERSION" >> $GITHUB_ENV
-          echo Last build tool version is: $BUILD_TOOL_VERSION
+      - name: Validate Gradle Wrapper
+        uses: gradle/wrapper-validation-action@v3
 
-      - name: Accept Android licenses
-        run: yes | "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager --licenses || true
+      - name: Copy CI gradle.properties
+        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          build-scan-publish: true
-          build-scan-terms-of-use-url: "https://gradle.com/terms-of-service"
-          build-scan-terms-of-use-agree: "yes"
+          distribution: 'zulu'
+          java-version: 17
+
+      - name: Accept Android licenses
+        run: yes | "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager --licenses || true
 
       - name: Remove Firebase References
         run: |
-            sed -i -e '/androidx.dev/d' settings.gradle.kts
-            sed -i -e '/with(target) {/,/^        }/d' -e '/CrashlyticsExtension/d' build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt
-            sed -i -e '/libs.firebase/d' build-logic/convention/build.gradle.kts
+          sed -i -e '/androidx.dev/d' settings.gradle.kts
+          sed -i -e '/with(target) {/,/^        }/d' -e '/CrashlyticsExtension/d' build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt
+          sed -i -e '/libs.firebase/d' build-logic/convention/build.gradle.kts
 
-      - name: Generate Release APK
-        run: ./gradlew assembleFossReliantRelease
+      - name: Build release variant apk
+        run: ./gradlew :app:assembleFossReliantRelease
 
       - name: Sign APK
-        uses: r0adkll/sign-android-release@v1
+        uses: r0adkll/sign-android-release@v1.0.4
         with:
           releaseDirectory: app/build/outputs/apk/fossReliant/release
           signingKeyBase64: ${{ secrets.SIGNING_KEY }}
           alias: ${{ secrets.ALIAS }}
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
         env:
-          BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
+          BUILD_TOOLS_VERSION: "34.0.0"
 
-      # 4
       - name: Draft Release
         uses: ncipollo/[email protected]
         with:
@@ -69,3 +65,4 @@ jobs:
           generateReleaseNotes: true
           bodyFile: distribution/whatsnew/whatsnew-en-US
           prerelease: false
+
diff --git a/.github/workflows/deploy_play_to_github.yml b/.github/workflows/deploy_play_to_github.yml
@@ -5,55 +5,51 @@ on:
     tags:
       - '[0-9]+.[0-9]+.[0-9]+'
 
-## 2
 jobs:
-  ## 3
   build:
     runs-on: ubuntu-latest
+    timeout-minutes: 120
+
     steps:
-      # 1
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          java-version: '17'
-      # 2
+      - name: Enable KVM group perms
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+          ls /dev/kvm
 
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
+      - name: Checkout
+        uses: actions/checkout@v4
 
-      - name: Setup build tool version variable
-        shell: bash
-        run: |
-          BUILD_TOOL_VERSION=$(ls /usr/local/lib/android/sdk/build-tools/ | tail -n 1)
-          echo "BUILD_TOOL_VERSION=$BUILD_TOOL_VERSION" >> $GITHUB_ENV
-          echo Last build tool version is: $BUILD_TOOL_VERSION
+      - name: Validate Gradle Wrapper
+        uses: gradle/wrapper-validation-action@v3
 
-      - name: Accept Android licenses
-        run: yes | "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager --licenses || true
+      - name: Copy CI gradle.properties
+        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          build-scan-publish: true
-          build-scan-terms-of-use-url: "https://gradle.com/terms-of-service"
-          build-scan-terms-of-use-agree: "yes"
+          distribution: 'zulu'
+          java-version: 17
+
+      - name: Accept Android licenses
+        run: yes | "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager --licenses || true
 
-      - name: Generate Release APK
-        run: ./gradlew assembleGooglePlayRelease
+      - name: Build release variant apk
+        run: ./gradlew :app:assembleGooglePlayRelease
 
       - name: Sign APK
-        uses: r0adkll/sign-android-release@v1
+        uses: r0adkll/sign-android-release@v1.0.4
         with:
           releaseDirectory: app/build/outputs/apk/googlePlay/release
           signingKeyBase64: ${{ secrets.SIGNING_KEY }}
           alias: ${{ secrets.ALIAS }}
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
         env:
-          BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
+          BUILD_TOOLS_VERSION: "34.0.0"
 
-      # 4
       - name: Draft Release
         uses: ncipollo/[email protected]
         with:
@@ -63,3 +59,4 @@ jobs:
           generateReleaseNotes: true
           bodyFile: distribution/whatsnew/whatsnew-en-US
           prerelease: false
+
diff --git a/.github/workflows/generate_baselineprofile.yml b/.github/workflows/generate_baselineprofile.yml
@@ -0,0 +1,58 @@
+name: Generate Baseline Profiles
+
+on:
+  push:
+    tags:
+      - 'b[0-9]+.[0-9]+.[0-9]+'
+
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 120
+
+    steps:
+      - name: Enable KVM group perms
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+          ls /dev/kvm
+
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Validate Gradle Wrapper
+        uses: gradle/wrapper-validation-action@v3
+
+      - name: Copy CI gradle.properties
+        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: 17
+
+      - name: Install GMD image for baseline profile generation
+        run: yes | "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager "system-images;android-33;aosp_atd;x86_64"
+
+      - name: Accept Android licenses
+        run: yes | "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager --licenses || true
+
+      - name: Build release variant including baseline profile generation
+        run: ./gradlew generateBaselineProfile
+          -Pandroid.testInstrumentationRunnerArguments.androidx.benchmark.enabledRules=BaselineProfile
+          -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect"
+          -Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true
+          -Pandroid.experimental.androidTest.numManagedDeviceShards=1
+          -Pandroid.experimental.testOptions.managedDevices.maxConcurrentDevices=1
+
+      - name: Create pull request
+        uses: peter-evans/[email protected]
+        with:
+          commit-message: Updated baseline profiles
+          title: Updated baseline profiles
+          body: ""
+          branch: update-baseline-profiles
+          base: develop
diff --git a/...tadata/android/en-US/shot_description.txt → ...adata/android/en-US/short_description.txt b/...tadata/android/en-US/shot_description.txt → ...adata/android/en-US/short_description.txt