Skip to content

Commit 537e741

Browse files
mshdabiolamshdabiola
committed
Merge branch 'hotfix/1.2.8'
2 parents 9499c6d + d559dbe commit 537e741

File tree

4 files changed

+113
-61
lines changed

4 files changed

+113
-61
lines changed

‎.github/workflows/deploy_foss_to_github.yml

Lines changed: 29 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5,61 +5,57 @@ on:
55
tags:
66
- '[0-9]+.[0-9]+.[0-9]+'
77

8-
## 2
98
jobs:
10-
## 3
119
build:
1210
runs-on: ubuntu-latest
11+
timeout-minutes: 120
12+
1313
steps:
14-
# 1
15-
- uses: actions/checkout@v3
16-
- uses: actions/setup-java@v3
17-
with:
18-
distribution: 'zulu'
19-
java-version: '17'
20-
# 2
14+
- name: Enable KVM group perms
15+
run: |
16+
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
17+
sudo udevadm control --reload-rules
18+
sudo udevadm trigger --name-match=kvm
19+
ls /dev/kvm
2120
22-
- name: Setup Android SDK
23-
uses: android-actions/setup-android@v2
21+
- name: Checkout
22+
uses: actions/checkout@v4
2423

25-
- name: Setup build tool version variable
26-
shell: bash
27-
run: |
28-
BUILD_TOOL_VERSION=$(ls /usr/local/lib/android/sdk/build-tools/ | tail -n 1)
29-
echo "BUILD_TOOL_VERSION=$BUILD_TOOL_VERSION" >> $GITHUB_ENV
30-
echo Last build tool version is: $BUILD_TOOL_VERSION
24+
- name: Validate Gradle Wrapper
25+
uses: gradle/wrapper-validation-action@v3
3126

32-
- name: Accept Android licenses
33-
run: yes | "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager --licenses || true
27+
- name: Copy CI gradle.properties
28+
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
3429

35-
- name: Setup Gradle
36-
uses: gradle/actions/setup-gradle@v3
30+
- name: Set up JDK 17
31+
uses: actions/setup-java@v4
3732
with:
38-
build-scan-publish: true
39-
build-scan-terms-of-use-url: "https://gradle.com/terms-of-service"
40-
build-scan-terms-of-use-agree: "yes"
33+
distribution: 'zulu'
34+
java-version: 17
35+
36+
- name: Accept Android licenses
37+
run: yes | "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager --licenses || true
4138

4239
- name: Remove Firebase References
4340
run: |
44-
sed -i -e '/androidx.dev/d' settings.gradle.kts
45-
sed -i -e '/with(target) {/,/^ }/d' -e '/CrashlyticsExtension/d' build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt
46-
sed -i -e '/libs.firebase/d' build-logic/convention/build.gradle.kts
41+
sed -i -e '/androidx.dev/d' settings.gradle.kts
42+
sed -i -e '/with(target) {/,/^ }/d' -e '/CrashlyticsExtension/d' build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt
43+
sed -i -e '/libs.firebase/d' build-logic/convention/build.gradle.kts
4744
48-
- name: Generate Release APK
49-
run: ./gradlew assembleFossReliantRelease
45+
- name: Build release variant apk
46+
run: ./gradlew :app:assembleFossReliantRelease
5047

5148
- name: Sign APK
52-
uses: r0adkll/sign-android-release@v1
49+
uses: r0adkll/sign-android-release@v1.0.4
5350
with:
5451
releaseDirectory: app/build/outputs/apk/fossReliant/release
5552
signingKeyBase64: ${{ secrets.SIGNING_KEY }}
5653
alias: ${{ secrets.ALIAS }}
5754
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
5855
keyPassword: ${{ secrets.KEY_PASSWORD }}
5956
env:
60-
BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
57+
BUILD_TOOLS_VERSION: "34.0.0"
6158

62-
# 4
6359
- name: Draft Release
6460
uses: ncipollo/release-action@v1.14.0
6561
with:
@@ -69,3 +65,4 @@ jobs:
6965
generateReleaseNotes: true
7066
bodyFile: distribution/whatsnew/whatsnew-en-US
7167
prerelease: false
68+

‎.github/workflows/deploy_play_to_github.yml

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,55 +5,51 @@ on:
55
tags:
66
- '[0-9]+.[0-9]+.[0-9]+'
77

8-
## 2
98
jobs:
10-
## 3
119
build:
1210
runs-on: ubuntu-latest
11+
timeout-minutes: 120
12+
1313
steps:
14-
# 1
15-
- uses: actions/checkout@v3
16-
- uses: actions/setup-java@v3
17-
with:
18-
distribution: 'zulu'
19-
java-version: '17'
20-
# 2
14+
- name: Enable KVM group perms
15+
run: |
16+
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
17+
sudo udevadm control --reload-rules
18+
sudo udevadm trigger --name-match=kvm
19+
ls /dev/kvm
2120
22-
- name: Setup Android SDK
23-
uses: android-actions/setup-android@v2
21+
- name: Checkout
22+
uses: actions/checkout@v4
2423

25-
- name: Setup build tool version variable
26-
shell: bash
27-
run: |
28-
BUILD_TOOL_VERSION=$(ls /usr/local/lib/android/sdk/build-tools/ | tail -n 1)
29-
echo "BUILD_TOOL_VERSION=$BUILD_TOOL_VERSION" >> $GITHUB_ENV
30-
echo Last build tool version is: $BUILD_TOOL_VERSION
24+
- name: Validate Gradle Wrapper
25+
uses: gradle/wrapper-validation-action@v3
3126

32-
- name: Accept Android licenses
33-
run: yes | "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager --licenses || true
27+
- name: Copy CI gradle.properties
28+
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
3429

35-
- name: Setup Gradle
36-
uses: gradle/actions/setup-gradle@v3
30+
- name: Set up JDK 17
31+
uses: actions/setup-java@v4
3732
with:
38-
build-scan-publish: true
39-
build-scan-terms-of-use-url: "https://gradle.com/terms-of-service"
40-
build-scan-terms-of-use-agree: "yes"
33+
distribution: 'zulu'
34+
java-version: 17
35+
36+
- name: Accept Android licenses
37+
run: yes | "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager --licenses || true
4138

42-
- name: Generate Release APK
43-
run: ./gradlew assembleGooglePlayRelease
39+
- name: Build release variant apk
40+
run: ./gradlew :app:assembleGooglePlayRelease
4441

4542
- name: Sign APK
46-
uses: r0adkll/sign-android-release@v1
43+
uses: r0adkll/sign-android-release@v1.0.4
4744
with:
4845
releaseDirectory: app/build/outputs/apk/googlePlay/release
4946
signingKeyBase64: ${{ secrets.SIGNING_KEY }}
5047
alias: ${{ secrets.ALIAS }}
5148
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
5249
keyPassword: ${{ secrets.KEY_PASSWORD }}
5350
env:
54-
BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
51+
BUILD_TOOLS_VERSION: "34.0.0"
5552

56-
# 4
5753
- name: Draft Release
5854
uses: ncipollo/release-action@v1.14.0
5955
with:
@@ -63,3 +59,4 @@ jobs:
6359
generateReleaseNotes: true
6460
bodyFile: distribution/whatsnew/whatsnew-en-US
6561
prerelease: false
62+

‎.github/workflows/generate_baselineprofile.yml

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: Generate Baseline Profiles
2+
3+
on:
4+
push:
5+
tags:
6+
- 'b[0-9]+.[0-9]+.[0-9]+'
7+
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
timeout-minutes: 120
13+
14+
steps:
15+
- name: Enable KVM group perms
16+
run: |
17+
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
18+
sudo udevadm control --reload-rules
19+
sudo udevadm trigger --name-match=kvm
20+
ls /dev/kvm
21+
22+
- name: Checkout
23+
uses: actions/checkout@v4
24+
25+
- name: Validate Gradle Wrapper
26+
uses: gradle/wrapper-validation-action@v3
27+
28+
- name: Copy CI gradle.properties
29+
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
30+
31+
- name: Set up JDK 17
32+
uses: actions/setup-java@v4
33+
with:
34+
distribution: 'zulu'
35+
java-version: 17
36+
37+
- name: Install GMD image for baseline profile generation
38+
run: yes | "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager "system-images;android-33;aosp_atd;x86_64"
39+
40+
- name: Accept Android licenses
41+
run: yes | "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager --licenses || true
42+
43+
- name: Build release variant including baseline profile generation
44+
run: ./gradlew generateBaselineProfile
45+
-Pandroid.testInstrumentationRunnerArguments.androidx.benchmark.enabledRules=BaselineProfile
46+
-Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect"
47+
-Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true
48+
-Pandroid.experimental.androidTest.numManagedDeviceShards=1
49+
-Pandroid.experimental.testOptions.managedDevices.maxConcurrentDevices=1
50+
51+
- name: Create pull request
52+
uses: peter-evans/create-pull-request@v5.0.2
53+
with:
54+
commit-message: Updated baseline profiles
55+
title: Updated baseline profiles
56+
body: ""
57+
branch: update-baseline-profiles
58+
base: develop

‎fastlane/metadata/android/en-US/shot_description.txt renamed to ‎fastlane/metadata/android/en-US/short_description.txt

File renamed without changes.

0 commit comments

Comments
 (0)