Skip to content

Commit 4848718

Browse files
denischilikdenischilik
committed
ci: pass -PVERSION explicitly for all kit Gradle steps
GITHUB_ENV ORG_GRADLE_PROJECT_VERSION was not reliably applied when using settings-kits.gradle; KitPlugin then fell back to '+' and resolved android-kit-base from Maven Central. Pass -PVERSION=...-ci on each publish, lint, ktlint, test, and urbanairship invocation. Made-with: Cursor
1 parent aecf127 commit 4848718

2 files changed

Lines changed: 17 additions & 29 deletions

File tree

‎.github/workflows/daily.yml‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,6 @@ jobs:
224224
uses: actions/checkout@v6
225225
with:
226226
ref: regression/${{ github.run_number }}
227-
- name: "Set ORG_GRADLE_PROJECT_VERSION (VERSION file + -ci)"
228-
run: echo "ORG_GRADLE_PROJECT_VERSION=$(head -n 1 VERSION)-ci" >> $GITHUB_ENV
229227
- name: "Install JDK 17"
230228
uses: actions/setup-java@v5
231229
with:
@@ -235,11 +233,11 @@ jobs:
235233
- name: "Run Android Core SDK Lint"
236234
run: ./gradlew lint
237235
- name: "Setup Android Kit Lint"
238-
run: ./gradlew publishMavenPublicationToMavenLocal
236+
run: ./gradlew publishMavenPublicationToMavenLocal -PVERSION=$(head -n 1 VERSION)-ci
239237
- name: "Run Android Kit Lint"
240-
run: ./gradlew lint -c settings-kits.gradle
238+
run: ./gradlew lint -c settings-kits.gradle -PVERSION=$(head -n 1 VERSION)-ci
241239
- name: "Run Isolated Kit Lint (urbanairship-kit)"
242-
run: ./gradlew -p kits/urbanairship/urbanairship-20 lint
240+
run: ./gradlew -p kits/urbanairship/urbanairship-20 -PVERSION=$(head -n 1 VERSION)-ci lint
243241
- name: "Archive Test Results"
244242
uses: actions/upload-artifact@v7
245243
if: always()
@@ -263,8 +261,6 @@ jobs:
263261
uses: actions/checkout@v6
264262
with:
265263
ref: regression/${{ github.run_number }}
266-
- name: "Set ORG_GRADLE_PROJECT_VERSION (VERSION file + -ci)"
267-
run: echo "ORG_GRADLE_PROJECT_VERSION=$(head -n 1 VERSION)-ci" >> $GITHUB_ENV
268264
- name: "Install JDK 17"
269265
uses: actions/setup-java@v5
270266
with:
@@ -274,11 +270,11 @@ jobs:
274270
- name: "Run Android Core SDK Kotlin Lint"
275271
run: ./gradlew ktlintCheck
276272
- name: "Setup Android Kit Kotlin Lint"
277-
run: ./gradlew publishMavenPublicationToMavenLocal
273+
run: ./gradlew publishMavenPublicationToMavenLocal -PVERSION=$(head -n 1 VERSION)-ci
278274
- name: "Run Android Kit Kotlin Lint"
279-
run: ./gradlew ktlintCheck -c settings-kits.gradle
275+
run: ./gradlew ktlintCheck -c settings-kits.gradle -PVERSION=$(head -n 1 VERSION)-ci
280276
- name: "Run Isolated Kit Kotlin Lint (urbanairship-kit)"
281-
run: ./gradlew -p kits/urbanairship/urbanairship-20 ktlintCheck
277+
run: ./gradlew -p kits/urbanairship/urbanairship-20 -PVERSION=$(head -n 1 VERSION)-ci ktlintCheck
282278
- name: "Archive Test Results"
283279
uses: actions/upload-artifact@v7
284280
if: always()
@@ -307,20 +303,18 @@ jobs:
307303
with:
308304
repository: mparticle/mparticle-android-sdk
309305
ref: regression/${{ github.run_number }}
310-
- name: "Set ORG_GRADLE_PROJECT_VERSION (VERSION file + -ci)"
311-
run: echo "ORG_GRADLE_PROJECT_VERSION=$(head -n 1 VERSION)-ci" >> $GITHUB_ENV
312306
- name: "Install JDK 17"
313307
uses: actions/setup-java@v5
314308
with:
315309
distribution: "zulu"
316310
java-version: "17"
317311
cache: "gradle"
318312
- name: "Build Android Core"
319-
run: ./gradlew clean publishMavenPublicationToMavenLocal
313+
run: ./gradlew clean publishMavenPublicationToMavenLocal -PVERSION=$(head -n 1 VERSION)-ci
320314
- name: "Test Kits"
321-
run: ./gradlew clean testRelease -c settings-kits.gradle
315+
run: ./gradlew clean testRelease -c settings-kits.gradle -PVERSION=$(head -n 1 VERSION)-ci
322316
- name: "Test Isolated Kits (urbanairship-kit)"
323-
run: ./gradlew -p kits/urbanairship/urbanairship-20 clean testRelease
317+
run: ./gradlew -p kits/urbanairship/urbanairship-20 -PVERSION=$(head -n 1 VERSION)-ci clean testRelease
324318

325319
semantic-release-dryrun:
326320
name: "Test Semantic Release - Dry Run"

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

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,6 @@ jobs:
100100
steps:
101101
- name: "Checkout Branch"
102102
uses: actions/checkout@v6
103-
- name: "Set ORG_GRADLE_PROJECT_VERSION (VERSION file + -ci)"
104-
run: echo "ORG_GRADLE_PROJECT_VERSION=$(head -n 1 VERSION)-ci" >> $GITHUB_ENV
105103
- name: "Install JDK 17"
106104
uses: actions/setup-java@v5
107105
with:
@@ -110,9 +108,9 @@ jobs:
110108
- name: "Run Android Core SDK Lint"
111109
run: ./gradlew lint
112110
- name: "Setup Android Kit Lint"
113-
run: ./gradlew publishMavenPublicationToMavenLocal
111+
run: ./gradlew publishMavenPublicationToMavenLocal -PVERSION=$(head -n 1 VERSION)-ci
114112
- name: "Run Android Kit Lint"
115-
run: ./gradlew -c settings-kits.gradle lint
113+
run: ./gradlew -c settings-kits.gradle lint -PVERSION=$(head -n 1 VERSION)-ci
116114
- name: "Archive Lint Test Results"
117115
uses: actions/upload-artifact@v7
118116
if: always()
@@ -127,8 +125,6 @@ jobs:
127125
steps:
128126
- name: "Checkout Branch"
129127
uses: actions/checkout@v6
130-
- name: "Set ORG_GRADLE_PROJECT_VERSION (VERSION file + -ci)"
131-
run: echo "ORG_GRADLE_PROJECT_VERSION=$(head -n 1 VERSION)-ci" >> $GITHUB_ENV
132128
- name: "Install JDK 17"
133129
uses: actions/setup-java@v5
134130
with:
@@ -137,9 +133,9 @@ jobs:
137133
- name: "Run Android Core SDK Kotlin Lint"
138134
run: ./gradlew ktlintCheck
139135
- name: "Setup Android Kit Kotlin Lint"
140-
run: ./gradlew publishMavenPublicationToMavenLocal
136+
run: ./gradlew publishMavenPublicationToMavenLocal -PVERSION=$(head -n 1 VERSION)-ci
141137
- name: "Run Android Kit Kotlin Lint"
142-
run: ./gradlew -c settings-kits.gradle ktlintCheck
138+
run: ./gradlew -c settings-kits.gradle ktlintCheck -PVERSION=$(head -n 1 VERSION)-ci
143139
- name: "Archive Kotlin Lint Test Results"
144140
uses: actions/upload-artifact@v7
145141
if: always()
@@ -160,21 +156,19 @@ jobs:
160156
steps:
161157
- name: "Checkout Branch"
162158
uses: actions/checkout@v6
163-
- name: "Set ORG_GRADLE_PROJECT_VERSION (VERSION file + -ci)"
164-
run: echo "ORG_GRADLE_PROJECT_VERSION=$(head -n 1 VERSION)-ci" >> $GITHUB_ENV
165159
- name: "Install JDK 17"
166160
uses: actions/setup-java@v5
167161
with:
168162
distribution: "zulu"
169163
java-version: "17"
170164
- name: "Generate Core Release Build"
171-
run: ./gradlew publishMavenPublicationToMavenLocal
165+
run: ./gradlew publishMavenPublicationToMavenLocal -PVERSION=$(head -n 1 VERSION)-ci
172166
- name: "Run Kit-Base Release Tests and Build"
173-
run: ./gradlew :android-kit-base:testRelease
167+
run: ./gradlew :android-kit-base:testRelease -PVERSION=$(head -n 1 VERSION)-ci
174168
- name: "Run Kit Release Tests and Build"
175-
run: ./gradlew -p kits testRelease -c ../settings-kits.gradle
169+
run: ./gradlew -p kits testRelease -c ../settings-kits.gradle -PVERSION=$(head -n 1 VERSION)-ci
176170
- name: "Run Isolated Kit Compatibility Tests (urbanairship)"
177-
run: ./gradlew -p kits/urbanairship/urbanairship-20 -PisRelease=true testRelease
171+
run: ./gradlew -p kits/urbanairship/urbanairship-20 -PisRelease=true -PVERSION=$(head -n 1 VERSION)-ci testRelease
178172

179173
automerge-dependabot:
180174
name: "Save PR Number for Dependabot Automerge"

0 commit comments

Comments
 (0)