Skip to content

Commit 00ce514

Browse files
Mansi-mParticleMansi-mParticle
committed
Merge remote-tracking branch 'origin/main' into feat/add-trunk-tool
2 parents e1dda29 + 2f1644a commit 00ce514

10 files changed

Lines changed: 190 additions & 85 deletions

File tree

‎.github/dependabot.yml‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,23 @@
11
version: 2
22
updates:
3-
- package-ecosystem: gradle
4-
directory: "/"
5-
schedule:
6-
interval: daily
7-
target-branch: "chore/dependabot"
8-
labels: ["dependabot"]
9-
open-pull-requests-limit: 10
10-
ignore:
11-
- dependency-name: "com.mparticle:android-core"
12-
- dependency-name: "com.google.firebase:firebase-messaging"
13-
commit-message:
14-
prefix: "chore"
3+
- package-ecosystem: gradle
4+
directory: "/"
5+
schedule:
6+
interval: daily
7+
target-branch: "chore/dependabot"
8+
labels: ["dependabot"]
9+
open-pull-requests-limit: 10
10+
ignore:
11+
- dependency-name: "com.mparticle:android-core"
12+
- dependency-name: "com.google.firebase:firebase-messaging"
13+
commit-message:
14+
prefix: "chore"
15+
- package-ecosystem: github-actions
16+
directory: /
17+
schedule:
18+
interval: weekly
19+
open-pull-requests-limit: 4
20+
labels:
21+
- dependabot
22+
commit-message:
23+
prefix: "chore"

‎.github/workflows/cross-platform-tests.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: "Checkout Cross Platform Tests Repo"
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v5
1414
with:
1515
repository: mParticle/crossplatform-sdk-tests
1616

1717
- name: "Checkout Android SDK Branch"
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v5
1919
with:
2020
repository: ${{github.event.pull_request.head.repo.full_name}}
2121
ref: ${{github.head_ref}}
@@ -35,7 +35,7 @@ jobs:
3535

3636
- name: create AVD and generate snapshot for caching
3737
if: steps.avd-cache.outputs.cache-hit != 'true'
38-
uses: reactivecircus/android-emulator-runner@62dbb605bba737720e10b196cb4220d374026a6d #v2.33.0
38+
uses: reactivecircus/android-emulator-runner@1dcd0090116d15e7c562f8db72807de5e036a4ed #v2.34.0
3939
with:
4040
api-level: 29
4141
force-avd-creation: false
@@ -53,7 +53,7 @@ jobs:
5353
distribution: "zulu"
5454
java-version: "17"
5555
- name: "Run Crossplatform Tests"
56-
uses: reactivecircus/android-emulator-runner@62dbb605bba737720e10b196cb4220d374026a6d #v2.33.0
56+
uses: reactivecircus/android-emulator-runner@1dcd0090116d15e7c562f8db72807de5e036a4ed #v2.34.0
5757
with:
5858
api-level: 29
5959
force-avd-creation: false
@@ -68,7 +68,7 @@ jobs:
6868
./gradlew runAndroid
6969
- name: "Archive Test Results"
7070
if: ${{ always() }}
71-
uses: actions/upload-artifact@v4
71+
uses: actions/upload-artifact@v5
7272
with:
7373
name: "test-results"
7474
path: Tests/build/reports/androidTests/connected/**

‎.github/workflows/daily.yml‎

Lines changed: 76 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
branch_name:
1717
description: "branch name to run tests on"
1818
required: false
19-
default: "development"
19+
default: main
2020
type: string
2121

2222
permissions:
@@ -31,7 +31,7 @@ jobs:
3131
steps:
3232
- name: "Cancel workflow"
3333
if: ${{ github.repository != 'mParticle/mparticle-android-sdk' }}
34-
uses: andymckay/cancel-action@435124153eb37d6a62a29d053a7e449652f89d51
34+
uses: andymckay/cancel-action@a955d435292c0d409d104b57d8e78435a93a6ef1
3535

3636
create-regression-branch:
3737
name: "Create Regression Branch"
@@ -45,13 +45,13 @@ jobs:
4545
GIT_COMMITTER_EMAIL: developers@mparticle.com
4646
steps:
4747
- name: "Clone branch"
48-
uses: actions/checkout@v4
48+
uses: actions/checkout@v5
4949
with:
5050
repository: mparticle/mparticle-android-sdk
5151
ref: ${{ inputs.branch_name }}
5252
submodules: recursive
5353
- name: "Import GPG Key"
54-
uses: crazy-max/ghaction-import-gpg@82a020f1f7f605c65dd2449b392a52c3fcfef7ef #v6.0
54+
uses: crazy-max/ghaction-import-gpg@e89d40939c28e39f97cf32126055eeae86ba74ec #v6.0
5555
with:
5656
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
5757
passphrase: ${{ secrets.GPG_PASSPHRASE }}
@@ -69,6 +69,67 @@ jobs:
6969
- name: "Push kit updates to release branch"
7070
run: git push origin regression/${{ github.run_number }}
7171

72+
# instrumented-tests:
73+
# name: "Instrumented Tests"
74+
# timeout-minutes: 30
75+
# runs-on: ubuntu-latest
76+
# needs: create-regression-branch
77+
# steps:
78+
# - name: "Checkout future release branch"
79+
# uses: actions/checkout@v5
80+
# with:
81+
# repository: mparticle/mparticle-android-sdk
82+
# ref: regression/${{ github.run_number }}
83+
# - name: "Install JDK 17"
84+
# uses: actions/setup-java@v3
85+
# with:
86+
# distribution: "zulu"
87+
# java-version: "17"
88+
# cache: "gradle"
89+
# - name: "Run Instrumented Tests"
90+
# uses: reactivecircus/android-emulator-runner@62dbb605bba737720e10b196cb4220d374026a6d #v2.33.0
91+
# with:
92+
# api-level: 28
93+
# #script: ./gradlew :android-core:cAT :android-kit-base:cAT --stacktrace
94+
# script: |
95+
# #Disable benchmark tests as they do not work on emulators
96+
# adb uninstall com.mparticle.kits.test; ./gradlew connectedCheck --stacktrace
97+
# ./gradlew :android-core:cAT :android-kit-base:cAT -Pandroid.testInstrumentationRunnerArguments.androidx.benchmark.enabledRules=none
98+
# - name: "Archive Instrumented Test Results"
99+
# uses: actions/upload-artifact@v5
100+
# if: always()
101+
# with:
102+
# name: instrumented-test-results
103+
# path: android-core/build/reports/androidTests/connected/**
104+
#
105+
# instrumented-orchestrator-tests:
106+
# name: "Instrumented Orchestrator Tests"
107+
# timeout-minutes: 30
108+
# runs-on: ubuntu-latest
109+
# needs: create-regression-branch
110+
# steps:
111+
# - name: "Checkout Branch"
112+
# uses: actions/checkout@v5
113+
# with:
114+
# repository: mparticle/mparticle-android-sdk
115+
# ref: regression/${{ github.run_number }}
116+
# - name: "Install JDK 17"
117+
# uses: actions/setup-java@v3
118+
# with:
119+
# distribution: "zulu"
120+
# java-version: "17"
121+
# cache: "gradle"
122+
# - name: "Run Instrumented Orchestrator Tests"
123+
# uses: reactivecircus/android-emulator-runner@62dbb605bba737720e10b196cb4220d374026a6d #v2.33.0
124+
# with:
125+
# api-level: 28
126+
# script: ./gradlew -Porchestrator=true :android-core:cAT --stacktrace
127+
# - name: "Archive Instrumented Orchestrator Tests Results"
128+
# uses: actions/upload-artifact@v5
129+
# if: always()
130+
# with:
131+
# name: "instrumented-orchestrator-tests-results"
132+
# path: android-core/build/orchestrator/**
72133
# instrumented-tests:
73134
# name: "Instrumented Tests"
74135
# timeout-minutes: 30
@@ -138,7 +199,7 @@ jobs:
138199
needs: create-regression-branch
139200
steps:
140201
- name: "Checkout future release branch"
141-
uses: actions/checkout@v4
202+
uses: actions/checkout@v5
142203
with:
143204
repository: mparticle/mparticle-android-sdk
144205
ref: regression/${{ github.run_number }}
@@ -154,7 +215,7 @@ jobs:
154215
uses: asadmansr/android-test-report-action@384cd31388782f4106dc4a1b37eea2ff02e0aad7 #v1.2.0
155216
if: always()
156217
- name: "Archive Unit Test Results"
157-
uses: actions/upload-artifact@v4
218+
uses: actions/upload-artifact@v5
158219
if: always()
159220
with:
160221
name: "unit-tests-results"
@@ -167,7 +228,7 @@ jobs:
167228
needs: create-regression-branch
168229
steps:
169230
- name: "Checkout Branch"
170-
uses: actions/checkout@v4
231+
uses: actions/checkout@v5
171232
with:
172233
ref: regression/${{ github.run_number }}
173234
submodules: recursive
@@ -184,13 +245,13 @@ jobs:
184245
- name: "Run Android Kit Lint"
185246
run: ./gradlew publishReleaseLocal -c settings-kits.gradle lint
186247
- name: "Archive Test Results"
187-
uses: actions/upload-artifact@v4
248+
uses: actions/upload-artifact@v5
188249
if: always()
189250
with:
190251
name: "core-lint-results"
191252
path: ./**/build/reports/**
192253
- name: "Archive Test Kit Results"
193-
uses: actions/upload-artifact@v4
254+
uses: actions/upload-artifact@v5
194255
if: always()
195256
with:
196257
name: "kit-lint-results"
@@ -203,7 +264,7 @@ jobs:
203264
needs: create-regression-branch
204265
steps:
205266
- name: "Checkout Branch"
206-
uses: actions/checkout@v4
267+
uses: actions/checkout@v5
207268
with:
208269
ref: regression/${{ github.run_number }}
209270
submodules: recursive
@@ -220,13 +281,13 @@ jobs:
220281
- name: "Run Android Kit Kotlin Lint"
221282
run: ./gradlew publishReleaseLocal -c settings-kits.gradle ktlintCheck
222283
- name: "Archive Test Results"
223-
uses: actions/upload-artifact@v4
284+
uses: actions/upload-artifact@v5
224285
if: always()
225286
with:
226287
name: "core-ktlint-results"
227288
path: ./**/build/reports/**
228289
- name: "Archive Test Kit Results"
229-
uses: actions/upload-artifact@v4
290+
uses: actions/upload-artifact@v5
230291
if: always()
231292
with:
232293
name: "kit-ktlint-results"
@@ -243,7 +304,7 @@ jobs:
243304
GIT_COMMITTER_EMAIL: developers@mparticle.com
244305
steps:
245306
- name: "Checkout future release branch"
246-
uses: actions/checkout@v4
307+
uses: actions/checkout@v5
247308
with:
248309
repository: mparticle/mparticle-android-sdk
249310
ref: regression/${{ github.run_number }}
@@ -271,7 +332,7 @@ jobs:
271332
GIT_COMMITTER_EMAIL: developers@mparticle.com
272333
steps:
273334
- name: "Checkout public main branch"
274-
uses: actions/checkout@v4
335+
uses: actions/checkout@v5
275336
with:
276337
fetch-depth: 0
277338
ref: main
@@ -302,7 +363,7 @@ jobs:
302363
GIT_COMMITTER_EMAIL: developers@mparticle.com
303364
steps:
304365
- name: "Checkout repo"
305-
uses: actions/checkout@v4
366+
uses: actions/checkout@v5
306367
with:
307368
fetch-depth: 0
308369
repository: ${{ github.repository }}

0 commit comments

Comments
 (0)