Skip to content

Commit 161aae1

Browse files
denischilikdenischilik
committed
ci: align workflow Gradle version property injection
Export both Gradle VERSION/version properties via GITHUB_ENV and remove redundant -Pversion CLI overrides from kit-related workflow commands. Made-with: Cursor
1 parent d544369 commit 161aae1

2 files changed

Lines changed: 16 additions & 10 deletions

File tree

‎.github/workflows/daily.yml‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ jobs:
225225
with:
226226
ref: regression/${{ github.run_number }}
227227
- run: echo "ORG_GRADLE_PROJECT_VERSION=$(head -n 1 VERSION)" >> $GITHUB_ENV
228+
- run: echo "ORG_GRADLE_PROJECT_version=$(head -n 1 VERSION)" >> $GITHUB_ENV
228229
- name: "Install JDK 17"
229230
uses: actions/setup-java@v5
230231
with:
@@ -236,9 +237,9 @@ jobs:
236237
- name: "Setup Android Kit Lint"
237238
run: ./gradlew publishMavenPublicationToMavenLocal
238239
- name: "Run Android Kit Lint"
239-
run: ./gradlew -Pversion=$(head -n 1 VERSION) lint -c settings-kits.gradle -Pmparticle.kit.mparticleFromMavenLocalOnly=true
240+
run: ./gradlew lint -c settings-kits.gradle -Pmparticle.kit.mparticleFromMavenLocalOnly=true
240241
- name: "Run Isolated Kit Lint (urbanairship-kit)"
241-
run: ./gradlew -Pversion=$(head -n 1 VERSION) -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/urbanairship/urbanairship-20 lint
242+
run: ./gradlew -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/urbanairship/urbanairship-20 lint
242243
- name: "Archive Test Results"
243244
uses: actions/upload-artifact@v7
244245
if: always()
@@ -263,6 +264,7 @@ jobs:
263264
with:
264265
ref: regression/${{ github.run_number }}
265266
- run: echo "ORG_GRADLE_PROJECT_VERSION=$(head -n 1 VERSION)" >> $GITHUB_ENV
267+
- run: echo "ORG_GRADLE_PROJECT_version=$(head -n 1 VERSION)" >> $GITHUB_ENV
266268
- name: "Install JDK 17"
267269
uses: actions/setup-java@v5
268270
with:
@@ -274,9 +276,9 @@ jobs:
274276
- name: "Setup Android Kit Kotlin Lint"
275277
run: ./gradlew publishMavenPublicationToMavenLocal
276278
- name: "Run Android Kit Kotlin Lint"
277-
run: ./gradlew -Pversion=$(head -n 1 VERSION) ktlintCheck -c settings-kits.gradle -Pmparticle.kit.mparticleFromMavenLocalOnly=true
279+
run: ./gradlew ktlintCheck -c settings-kits.gradle -Pmparticle.kit.mparticleFromMavenLocalOnly=true
278280
- name: "Run Isolated Kit Kotlin Lint (urbanairship-kit)"
279-
run: ./gradlew -Pversion=$(head -n 1 VERSION) -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/urbanairship/urbanairship-20 ktlintCheck
281+
run: ./gradlew -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/urbanairship/urbanairship-20 ktlintCheck
280282
- name: "Archive Test Results"
281283
uses: actions/upload-artifact@v7
282284
if: always()
@@ -306,6 +308,7 @@ jobs:
306308
repository: mparticle/mparticle-android-sdk
307309
ref: regression/${{ github.run_number }}
308310
- run: echo "ORG_GRADLE_PROJECT_VERSION=$(head -n 1 VERSION)" >> $GITHUB_ENV
311+
- run: echo "ORG_GRADLE_PROJECT_version=$(head -n 1 VERSION)" >> $GITHUB_ENV
309312
- name: "Install JDK 17"
310313
uses: actions/setup-java@v5
311314
with:
@@ -315,9 +318,9 @@ jobs:
315318
- name: "Build Android Core"
316319
run: ./gradlew clean publishMavenPublicationToMavenLocal
317320
- name: "Test Kits"
318-
run: ./gradlew -Pversion=$(head -n 1 VERSION) clean testRelease -c settings-kits.gradle -Pmparticle.kit.mparticleFromMavenLocalOnly=true
321+
run: ./gradlew clean testRelease -c settings-kits.gradle -Pmparticle.kit.mparticleFromMavenLocalOnly=true
319322
- name: "Test Isolated Kits (urbanairship-kit)"
320-
run: ./gradlew -Pversion=$(head -n 1 VERSION) -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/urbanairship/urbanairship-20 clean testRelease
323+
run: ./gradlew -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/urbanairship/urbanairship-20 clean testRelease
321324

322325
semantic-release-dryrun:
323326
name: "Test Semantic Release - Dry Run"

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ jobs:
101101
- name: "Checkout Branch"
102102
uses: actions/checkout@v6
103103
- run: echo "ORG_GRADLE_PROJECT_VERSION=$(head -n 1 VERSION)" >> $GITHUB_ENV
104+
- run: echo "ORG_GRADLE_PROJECT_version=$(head -n 1 VERSION)" >> $GITHUB_ENV
104105
- name: "Install JDK 17"
105106
uses: actions/setup-java@v5
106107
with:
@@ -111,7 +112,7 @@ jobs:
111112
- name: "Setup Android Kit Lint"
112113
run: ./gradlew publishMavenPublicationToMavenLocal
113114
- name: "Run Android Kit Lint"
114-
run: ./gradlew -Pversion=$(head -n 1 VERSION) -c settings-kits.gradle -Pmparticle.kit.mparticleFromMavenLocalOnly=true lint
115+
run: ./gradlew -c settings-kits.gradle -Pmparticle.kit.mparticleFromMavenLocalOnly=true lint
115116
- name: "Archive Lint Test Results"
116117
uses: actions/upload-artifact@v7
117118
if: always()
@@ -127,6 +128,7 @@ jobs:
127128
- name: "Checkout Branch"
128129
uses: actions/checkout@v6
129130
- run: echo "ORG_GRADLE_PROJECT_VERSION=$(head -n 1 VERSION)" >> $GITHUB_ENV
131+
- run: echo "ORG_GRADLE_PROJECT_version=$(head -n 1 VERSION)" >> $GITHUB_ENV
130132
- name: "Install JDK 17"
131133
uses: actions/setup-java@v5
132134
with:
@@ -137,7 +139,7 @@ jobs:
137139
- name: "Setup Android Kit Kotlin Lint"
138140
run: ./gradlew publishMavenPublicationToMavenLocal
139141
- name: "Run Android Kit Kotlin Lint"
140-
run: ./gradlew -Pversion=$(head -n 1 VERSION) -c settings-kits.gradle -Pmparticle.kit.mparticleFromMavenLocalOnly=true ktlintCheck
142+
run: ./gradlew -c settings-kits.gradle -Pmparticle.kit.mparticleFromMavenLocalOnly=true ktlintCheck
141143
- name: "Archive Kotlin Lint Test Results"
142144
uses: actions/upload-artifact@v7
143145
if: always()
@@ -159,6 +161,7 @@ jobs:
159161
- name: "Checkout Branch"
160162
uses: actions/checkout@v6
161163
- run: echo "ORG_GRADLE_PROJECT_VERSION=$(head -n 1 VERSION)" >> $GITHUB_ENV
164+
- run: echo "ORG_GRADLE_PROJECT_version=$(head -n 1 VERSION)" >> $GITHUB_ENV
162165
- name: "Install JDK 17"
163166
uses: actions/setup-java@v5
164167
with:
@@ -169,9 +172,9 @@ jobs:
169172
- name: "Run Kit-Base Release Tests and Build"
170173
run: ./gradlew :android-kit-base:testRelease
171174
- name: "Run Kit Release Tests and Build"
172-
run: ./gradlew -Pversion=$(head -n 1 VERSION) -p kits testRelease -c ../settings-kits.gradle -Pmparticle.kit.mparticleFromMavenLocalOnly=true
175+
run: ./gradlew -p kits testRelease -c ../settings-kits.gradle -Pmparticle.kit.mparticleFromMavenLocalOnly=true
173176
- name: "Run Isolated Kit Compatibility Tests (urbanairship)"
174-
run: ./gradlew -Pversion=$(head -n 1 VERSION) -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/urbanairship/urbanairship-20 -PisRelease=true testRelease
177+
run: ./gradlew -Pmparticle.kit.mparticleFromMavenLocalOnly=true -p kits/urbanairship/urbanairship-20 -PisRelease=true testRelease
175178

176179
automerge-dependabot:
177180
name: "Save PR Number for Dependabot Automerge"

0 commit comments

Comments
 (0)