Skip to content

Commit a66338c

Browse files
aleksandar-apostolovaleksandar-apostolov
committed
Merge branch 'refs/heads/develop'
2 parents a4cd73b + 42da5a6 commit a66338c

File tree

88 files changed

+7336
-1823
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+7336
-1823
lines changed

‎.github/actions/enable-kvm/action.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: 'Enable KVM'
2+
description: 'Enables hardware accelerated Android virtualization on Actions Linux larger hosted runners'
3+
runs:
4+
using: "composite"
5+
steps:
6+
- name: Enable KVM group perms
7+
shell: bash
8+
run: |
9+
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
10+
sudo udevadm control --reload-rules
11+
sudo udevadm trigger --name-match=kvm

‎.github/actions/gradle-cache/action.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: 'Gradle Cache'
2+
description: 'Cache Gradle Build Cache to improve workflow execution time'
3+
runs:
4+
using: "composite"
5+
steps:
6+
- uses: actions/cache@v4
7+
with:
8+
path: |
9+
~/.gradle/caches
10+
~/.gradle/wrapper
11+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
12+
restore-keys: |
13+
${{ runner.os }}-gradle-

‎.github/actions/setup-java/action.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: 'Setup Java'
2+
description: 'Setup Java'
3+
runs:
4+
using: "composite"
5+
steps:
6+
- name: Set up JDK 17
7+
uses: actions/setup-java@v4
8+
with:
9+
distribution: adopt
10+
java-version: 17

‎.github/actions/setup-ruby/action.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
name: 'Setup Ruby'
2+
description: 'Setup Ruby and cache bundler'
3+
runs:
4+
using: "composite"
5+
steps:
6+
- uses: ruby/setup-ruby@v1
7+
with:
8+
ruby-version: 3.1
9+
bundler-cache: true

‎.github/workflows/android.yml‎

Lines changed: 28 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,24 @@ name: Android CI
33
on:
44
push:
55
branches: [ main ]
6+
67
pull_request:
78
branches:
89
- '**'
910

11+
workflow_dispatch:
12+
13+
concurrency:
14+
group: ${{ github.workflow }}-${{ github.ref }}
15+
cancel-in-progress: true
16+
1017
env:
1118
BUILD_CACHE_AWS_REGION: ${{ secrets.BUILD_CACHE_AWS_REGION }}
1219
BUILD_CACHE_AWS_BUCKET: ${{ secrets.BUILD_CACHE_AWS_BUCKET }}
1320
BUILD_CACHE_AWS_ACCESS_KEY_ID: ${{ secrets.BUILD_CACHE_AWS_ACCESS_KEY_ID }}
1421
BUILD_CACHE_AWS_SECRET_KEY: ${{ secrets.BUILD_CACHE_AWS_SECRET_KEY }}
22+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
23+
GITHUB_PR_NUM: ${{ github.event.pull_request.number }}
1524

1625
jobs:
1726
lint:
@@ -20,11 +29,7 @@ jobs:
2029
steps:
2130
- name: Check out code
2231
uses: actions/[email protected]
23-
- name: Set up JDK
24-
uses: actions/[email protected]
25-
with:
26-
distribution: adopt
27-
java-version: 17
32+
- uses: ./.github/actions/setup-java
2833
- name: spotless
2934
run: ./gradlew spotlessCheck --scan
3035

@@ -34,11 +39,7 @@ jobs:
3439
steps:
3540
- name: Check out code
3641
uses: actions/[email protected]
37-
- name: Set up JDK
38-
uses: actions/[email protected]
39-
with:
40-
distribution: adopt
41-
java-version: 17
42+
- uses: ./.github/actions/setup-java
4243
- name: API check
4344
run: ./gradlew apiCheck --scan
4445

@@ -47,21 +48,9 @@ jobs:
4748
steps:
4849
- uses: actions/checkout@v3
4950

50-
- name: set up JDK
51-
uses: actions/[email protected]
52-
with:
53-
distribution: adopt
54-
java-version: 17
51+
- uses: ./.github/actions/setup-java
5552

56-
- name: Cache Gradle and wrapper
57-
uses: actions/cache@v3
58-
with:
59-
path: |
60-
~/.gradle/caches
61-
~/.gradle/wrapper
62-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
63-
restore-keys: |
64-
${{ runner.os }}-gradle-
53+
- uses: ./.github/actions/gradle-cache
6554

6655
- name: Make Gradle executable
6756
run: chmod +x ./gradlew
@@ -79,26 +68,14 @@ jobs:
7968
- name: Checkout
8069
uses: actions/checkout@v3
8170

82-
- name: set up JDK
83-
uses: actions/[email protected]
84-
with:
85-
distribution: adopt
86-
java-version: 17
71+
- uses: ./.github/actions/setup-java
8772

88-
- name: Cache Gradle and wrapper
89-
uses: actions/cache@v3
90-
with:
91-
path: |
92-
~/.gradle/caches
93-
~/.gradle/wrapper
94-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
95-
restore-keys: |
96-
${{ runner.os }}-gradle-
73+
- uses: ./.github/actions/gradle-cache
9774

9875
- name: Run unit tests
9976
run: |
100-
./gradlew :stream-video-android-ui-compose:testDebugUnitTest --scan --stacktrace
101-
./gradlew :stream-video-android-core:testDebugUnitTest --scan --stacktrace
77+
./gradlew :stream-video-android-ui-compose:koverXmlReportDebug --scan --stacktrace
78+
./gradlew :stream-video-android-core:koverXmlReportDebug --scan --stacktrace
10279
10380
- name: Unit tests core results
10481
uses: actions/upload-artifact@v4
@@ -112,21 +89,26 @@ jobs:
11289
name: unit-tests-compose-results
11390
path: stream-video-android-ui-compose/build/reports/tests/testDebugUnitTest/index.html
11491

92+
- uses: ./.github/actions/setup-ruby
93+
94+
- name: Sonar
95+
run: bundle exec fastlane run_sonar_analysis
96+
env:
97+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
98+
11599
androidTest-GMD:
116100
name: Android Test with GMD
117101
if: ${{ false }} # disable for now
118-
runs-on: macOS-latest
102+
runs-on: ubuntu-latest
119103
timeout-minutes: 55
120104

121105
steps:
122106
- name: Checkout
123107
uses: actions/checkout@v3
124108

125-
- name: Set up JDK 17
126-
uses: actions/[email protected]
127-
with:
128-
distribution: 'zulu'
129-
java-version: 17
109+
- uses: ./.github/actions/setup-java
110+
111+
- uses: ./.github/actions/enable-kvm
130112

131113
# Sets gradle up
132114
- name: Setup Gradle

‎.github/workflows/app-distribute.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@ jobs:
1212
runs-on: ubuntu-22.04
1313
steps:
1414
- uses: actions/checkout@v2
15-
- name: Set up JDK 17
16-
uses: actions/setup-java@v2
17-
with:
18-
distribution: adopt
19-
java-version: 17
15+
- uses: ./.github/actions/setup-java
2016
- name: Prepare environment
2117
run: |
2218
echo "${{ secrets.RELEASE_KEYSTORE }}" > .sign/release.keystore.asc

‎.github/workflows/artifact-upload.yaml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,7 @@ jobs:
1515
- name: Checkout code
1616
uses: actions/checkout@v2
1717

18-
- name: Set up JDK 17
19-
uses: actions/setup-java@v2
20-
with:
21-
distribution: adopt
22-
java-version: 17
18+
- uses: ./.github/actions/setup-java
2319

2420
- name: Prepare environment
2521
run: |

‎.github/workflows/internal-app-distribute.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@ jobs:
1212
runs-on: ubuntu-22.04
1313
steps:
1414
- uses: actions/checkout@v2
15-
- name: Set up JDK 17
16-
uses: actions/setup-java@v2
17-
with:
18-
distribution: adopt
19-
java-version: 17
15+
- uses: ./.github/actions/setup-java
2016
- name: Prepare environment
2117
run: |
2218
echo "${{ secrets.RELEASE_KEYSTORE }}" > .sign/release.keystore.asc

‎.github/workflows/publish-snapshot.yml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches:
66
- develop
77
workflow_dispatch:
8-
8+
99
jobs:
1010
publish:
1111
name: Snapshot build and publish
@@ -14,11 +14,7 @@ jobs:
1414
- name: Check out code
1515
uses: actions/[email protected]
1616

17-
- name: Set up JDK 17
18-
uses: actions/[email protected]
19-
with:
20-
distribution: adopt
21-
java-version: 17
17+
- uses: ./.github/actions/setup-java
2218

2319
- name: Release build
2420
# assembleRelease for all modules, excluding non-library modules: samples, docs

‎.github/workflows/publish.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@ jobs:
1616
# with:
1717
# ref: release
1818

19-
- name: Set up JDK 17
20-
uses: actions/[email protected]
21-
with:
22-
distribution: adopt
23-
java-version: 17
19+
- uses: ./.github/actions/setup-java
2420

2521
- name: Release build
2622
# assembleRelease for all modules, excluding non-library modules: samples, docs

0 commit comments

Comments
 (0)