Skip to content

Commit bc540c6

Browse files
jamesnroktjamesnrokt
authored
Merge branch 'main' into feat/SDKE-532-Implement-integration-test
2 parents 35a81e7 + 0780abd commit bc540c6

6 files changed

Lines changed: 61 additions & 39 deletions

File tree

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

Lines changed: 3 additions & 3 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@v5
13+
uses: actions/checkout@v6
1414
with:
1515
repository: mParticle/crossplatform-sdk-tests
1616

1717
- name: "Checkout Android SDK Branch"
18-
uses: actions/checkout@v5
18+
uses: actions/checkout@v6
1919
with:
2020
repository: ${{github.event.pull_request.head.repo.full_name}}
2121
ref: ${{github.head_ref}}
@@ -48,7 +48,7 @@ jobs:
4848
sudo udevadm control --reload-rules
4949
sudo udevadm trigger --name-match=kvm
5050
- name: "Install JDK 17"
51-
uses: actions/setup-java@v4
51+
uses: actions/setup-java@v5
5252
with:
5353
distribution: "zulu"
5454
java-version: "17"

‎.github/workflows/daily.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
GIT_COMMITTER_EMAIL: developers@mparticle.com
4646
steps:
4747
- name: "Clone branch"
48-
uses: actions/checkout@v5
48+
uses: actions/checkout@v6
4949
with:
5050
token: ${{ secrets.MP_SEMANTIC_RELEASE_BOT }}
5151
repository: mparticle/mparticle-android-sdk
@@ -77,7 +77,7 @@ jobs:
7777
# needs: create-regression-branch
7878
# steps:
7979
# - name: "Checkout future release branch"
80-
# uses: actions/checkout@v5
80+
# uses: actions/checkout@v6
8181
# with:
8282
# repository: mparticle/mparticle-android-sdk
8383
# ref: regression/${{ github.run_number }}
@@ -110,7 +110,7 @@ jobs:
110110
# needs: create-regression-branch
111111
# steps:
112112
# - name: "Checkout Branch"
113-
# uses: actions/checkout@v5
113+
# uses: actions/checkout@v6
114114
# with:
115115
# repository: mparticle/mparticle-android-sdk
116116
# ref: regression/${{ github.run_number }}
@@ -143,7 +143,7 @@ jobs:
143143
# repository: mparticle/mparticle-android-sdk
144144
# ref: regression/${{ github.run_number }}
145145
# - name: "Install JDK 17"
146-
# uses: actions/setup-java@v4
146+
# uses: actions/setup-java@v5
147147
# with:
148148
# distribution: "zulu"
149149
# java-version: "17"
@@ -176,7 +176,7 @@ jobs:
176176
# repository: mparticle/mparticle-android-sdk
177177
# ref: regression/${{ github.run_number }}
178178
# - name: "Install JDK 17"
179-
# uses: actions/setup-java@v4
179+
# uses: actions/setup-java@v5
180180
# with:
181181
# distribution: "zulu"
182182
# java-version: "17"
@@ -200,12 +200,12 @@ jobs:
200200
needs: create-regression-branch
201201
steps:
202202
- name: "Checkout future release branch"
203-
uses: actions/checkout@v5
203+
uses: actions/checkout@v6
204204
with:
205205
repository: mparticle/mparticle-android-sdk
206206
ref: regression/${{ github.run_number }}
207207
- name: "Install JDK 17"
208-
uses: actions/setup-java@v4
208+
uses: actions/setup-java@v5
209209
with:
210210
distribution: "zulu"
211211
java-version: "17"
@@ -229,12 +229,12 @@ jobs:
229229
needs: create-regression-branch
230230
steps:
231231
- name: "Checkout Branch"
232-
uses: actions/checkout@v5
232+
uses: actions/checkout@v6
233233
with:
234234
ref: regression/${{ github.run_number }}
235235
submodules: recursive
236236
- name: "Install JDK 17"
237-
uses: actions/setup-java@v4
237+
uses: actions/setup-java@v5
238238
with:
239239
distribution: "zulu"
240240
java-version: "17"
@@ -265,12 +265,12 @@ jobs:
265265
needs: create-regression-branch
266266
steps:
267267
- name: "Checkout Branch"
268-
uses: actions/checkout@v5
268+
uses: actions/checkout@v6
269269
with:
270270
ref: regression/${{ github.run_number }}
271271
submodules: recursive
272272
- name: "Install JDK 17"
273-
uses: actions/setup-java@v4
273+
uses: actions/setup-java@v5
274274
with:
275275
distribution: "zulu"
276276
java-version: "17"
@@ -305,13 +305,13 @@ jobs:
305305
GIT_COMMITTER_EMAIL: developers@mparticle.com
306306
steps:
307307
- name: "Checkout future release branch"
308-
uses: actions/checkout@v5
308+
uses: actions/checkout@v6
309309
with:
310310
repository: mparticle/mparticle-android-sdk
311311
ref: regression/${{ github.run_number }}
312312
submodules: recursive
313313
- name: "Install JDK 17"
314-
uses: actions/setup-java@v4
314+
uses: actions/setup-java@v5
315315
with:
316316
distribution: "zulu"
317317
java-version: "17"
@@ -333,7 +333,7 @@ jobs:
333333
GIT_COMMITTER_EMAIL: developers@mparticle.com
334334
steps:
335335
- name: "Checkout public main branch"
336-
uses: actions/checkout@v5
336+
uses: actions/checkout@v6
337337
with:
338338
fetch-depth: 0
339339
ref: main
@@ -364,7 +364,7 @@ jobs:
364364
GIT_COMMITTER_EMAIL: developers@mparticle.com
365365
steps:
366366
- name: "Checkout repo"
367-
uses: actions/checkout@v5
367+
uses: actions/checkout@v6
368368
with:
369369
token: ${{ secrets.MP_SEMANTIC_RELEASE_BOT }}
370370
fetch-depth: 0

‎.github/workflows/pull-request.yml‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ permissions:
1212
checks: write
1313
id-token: write
1414

15-
# Code quality checks
15+
jobs:
1616
trunk-check:
1717
name: Trunk code check
1818
runs-on: ubuntu-latest
@@ -21,10 +21,7 @@ permissions:
2121
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
2222
- name: Trunk Check
2323
uses: trunk-io/trunk-action@75699af9e26881e564e9d832ef7dc3af25ec031b # v1.2.4
24-
with:
25-
check-mode: all
2624

27-
jobs:
2825
pr-check-hadcoded-secrets:
2926
name: "Check PR for hardcoded secrets"
3027
uses: mParticle/mparticle-workflows/.github/workflows/security-hardcoded-secrets.yml@main
@@ -41,9 +38,9 @@ jobs:
4138
runs-on: ubuntu-latest
4239
steps:
4340
- name: "Checkout Branch"
44-
uses: actions/checkout@v5
41+
uses: actions/checkout@v6
4542
- name: "Install JDK 17"
46-
uses: actions/setup-java@v4
43+
uses: actions/setup-java@v5
4744
with:
4845
distribution: "zulu"
4946
java-version: "17"
@@ -102,9 +99,9 @@ jobs:
10299
runs-on: ubuntu-latest
103100
steps:
104101
- name: "Checkout Branch"
105-
uses: actions/checkout@v5
102+
uses: actions/checkout@v6
106103
- name: "Install JDK 17"
107-
uses: actions/setup-java@v4
104+
uses: actions/setup-java@v5
108105
with:
109106
distribution: "zulu"
110107
java-version: "17"
@@ -162,9 +159,9 @@ jobs:
162159
runs-on: ubuntu-latest
163160
steps:
164161
- name: "Checkout Branch"
165-
uses: actions/checkout@v5
162+
uses: actions/checkout@v6
166163
- name: "Install JDK 17"
167-
uses: actions/setup-java@v4
164+
uses: actions/setup-java@v5
168165
with:
169166
distribution: "zulu"
170167
java-version: "17"
@@ -186,11 +183,11 @@ jobs:
186183
runs-on: macos-latest
187184
steps:
188185
- name: "Checkout Branch"
189-
uses: actions/checkout@v5
186+
uses: actions/checkout@v6
190187
with:
191188
submodules: recursive
192189
- name: "Install JDK 17"
193-
uses: actions/setup-java@v4
190+
uses: actions/setup-java@v5
194191
with:
195192
distribution: "zulu"
196193
java-version: "17"
@@ -209,11 +206,11 @@ jobs:
209206
runs-on: macos-latest
210207
steps:
211208
- name: "Checkout Branch"
212-
uses: actions/checkout@v5
209+
uses: actions/checkout@v6
213210
with:
214211
submodules: recursive
215212
- name: "Install JDK 17"
216-
uses: actions/setup-java@v4
213+
uses: actions/setup-java@v5
217214
with:
218215
distribution: "zulu"
219216
java-version: "17"
@@ -238,12 +235,12 @@ jobs:
238235
if: github.event_name == 'pull_request'
239236
steps:
240237
- name: "Checkout Branch"
241-
uses: actions/checkout@v5
238+
uses: actions/checkout@v6
242239
with:
243240
submodules: recursive
244241
fetch-depth: 0
245242
- name: "Install JDK 17"
246-
uses: actions/setup-java@v4
243+
uses: actions/setup-java@v5
247244
with:
248245
distribution: "zulu"
249246
java-version: "17"

‎.github/workflows/release.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
GIT_COMMITTER_EMAIL: developers@mparticle.com
3333
steps:
3434
- name: Checkout main branch
35-
uses: actions/checkout@v5
35+
uses: actions/checkout@v6
3636
with:
3737
token: ${{ secrets.MP_SEMANTIC_RELEASE_BOT }}
3838
repository: mparticle/mparticle-android-sdk
@@ -78,7 +78,7 @@ jobs:
7878
GIT_COMMITTER_EMAIL: developers@mparticle.com
7979
steps:
8080
- name: "Checkout public main branch"
81-
uses: actions/checkout@v5
81+
uses: actions/checkout@v6
8282
with:
8383
token: ${{ secrets.MP_SEMANTIC_RELEASE_BOT }}
8484
fetch-depth: 0
@@ -131,13 +131,13 @@ jobs:
131131
mavenSigningKeyPassword: ${{ secrets.MAVEN_CENTRAL_SIGNING_KEY_PASSWORD }}
132132
steps:
133133
- name: "Checkout release branch"
134-
uses: actions/checkout@v5
134+
uses: actions/checkout@v6
135135
with:
136136
repository: mparticle/mparticle-android-sdk
137137
ref: release/${{ github.run_number }}
138138
submodules: recursive
139139
- name: "Install JDK 17"
140-
uses: actions/setup-java@v4
140+
uses: actions/setup-java@v5
141141
with:
142142
distribution: "zulu"
143143
java-version: "17"
@@ -170,7 +170,7 @@ jobs:
170170
runs-on: ubuntu-latest
171171
steps:
172172
- name: "Checkout main branch"
173-
uses: actions/checkout@v5
173+
uses: actions/checkout@v6
174174
with:
175175
fetch-depth: 0
176176
repository: ${{ github.repository }}

‎.github/workflows/reusable-workflows.yml‎

Whitespace-only changes.

‎.trunk/trunk.yaml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,31 @@ lint:
3535
- shellcheck@0.11.0
3636
- shfmt@3.6.0
3737
- trufflehog@3.90.6
38+
- mparticle-api-key-check # Custom rule to prevent mParticle API keys from being committed
39+
definitions:
40+
- name: mparticle-api-key-check
41+
files: [ALL]
42+
commands:
43+
- name: check-mparticle-keys
44+
output: pass_fail
45+
# ──────────────────────────────────────────────────────────────────────
46+
# Matches:
47+
# us2-[32 hex chars]
48+
# us1-...
49+
# us-...
50+
# eu1-...
51+
# Any two lowercase letters + optional digits + hyphen + exactly 32 hex chars
52+
# ──────────────────────────────────────────────────────────────────────
53+
run: >-
54+
sh -c '
55+
if grep -E "(?i)[a-z]{2}[0-9]*-[0-9a-f]{32}" "${target}"; then
56+
echo "ERROR: Possible mParticle API key detected in ${target}"
57+
echo " Format: xx...-[32 hex chars] (e.g. us2-, eu1-, us-, au4-, etc.)"
58+
echo "API keys should never be committed to version control!"
59+
exit 1
60+
fi
61+
'
62+
success_codes: [0, 1]
3863
disabled:
3964
- yamllint
4065
ignore:

0 commit comments

Comments
 (0)