Skip to content

Commit 649b679

Browse files
committed
Tuned iOS CI and added android build debug info
1 parent a85d66b commit 649b679

File tree

2 files changed

+42
-5
lines changed

2 files changed

+42
-5
lines changed

.github/workflows/scripts-ios.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,31 @@
1-
---
21
name: Test iOS build scripts
32

4-
'on':
3+
on:
54
pull_request:
65
paths:
76
- 'scripts/**'
87
- 'BUILDING.md'
98
push:
10-
branches:
11-
- master
9+
branches: [ master ]
1210
paths-ignore:
1311
- '**/*.md'
1412

1513
jobs:
1614
build-ios:
17-
runs-on: macos-latest
15+
runs-on: macos-15 # pinning macos-15 avoids surprises during the cutover window
16+
timeout-minutes: 20 # hard-stop the job after 20 minutes
17+
concurrency: # ensure only one mac build runs at once
18+
group: mac-ci
19+
cancel-in-progress: false # queue new ones instead of canceling in-flight
20+
1821
steps:
1922
- uses: actions/checkout@v4
23+
2024
- name: Setup workspace
2125
run: ./scripts/setup-workspace.sh -q -DskipTests
26+
# per-step timeout
27+
timeout-minutes: 6
28+
2229
- name: Build iOS port
2330
run: ./scripts/build-ios-port.sh -q -DskipTests
31+
timeout-minutes: 15

scripts/build-android-app.sh

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,35 @@ xvfb-run -a "${MAVEN_CMD[@]}" -q -f "$APP_DIR/pom.xml" \
173173
-DgenerateBackupPoms=false \
174174
-DprocessAllModules=true || true
175175

176+
# Validate changes
177+
# 1) Show the resolved com.codenameone artifacts and EXACT files used
178+
ba_log "Resolved Codename One dependencies (with file paths)"
179+
xvfb-run -a "${MAVEN_CMD[@]}" -q -f "$APP_DIR/pom.xml" \
180+
-U \
181+
org.apache.maven.plugins:maven-dependency-plugin:3.6.1:list \
182+
-DincludeGroupIds=com.codenameone \
183+
-DoutputAbsoluteArtifactFilename=true
184+
185+
# 2) Full tree (helps spot leftover fixed versions / parents / pluginManagement)
186+
ba_log "Dependency tree (grep com.codenameone)"
187+
xvfb-run -a "${MAVEN_CMD[@]}" -q -f "$APP_DIR/pom.xml" \
188+
-U \
189+
org.apache.maven.plugins:maven-dependency-plugin:3.6.1:tree \
190+
-Dincludes=com.codenameone:* | sed 's/^/[build-android-app] TREE: /'
191+
192+
# 3) Confirm what version is actually in the POM after your versions:* steps
193+
ba_log "Grepping for codenameone version/property in POM"
194+
grep -nE 'codenameone\.version|com\.codenameone' "$APP_DIR/pom.xml" \
195+
| sed 's/^/[build-android-app] POM: /'
196+
197+
# 4) Print the exact artifact on disk we expect to be used (adjust artifactIds as needed)
198+
for AID in "codenameone-core" "codenameone-maven-plugin" "codenameone-android"; do
199+
FOUND=$(find "$LOCAL_MAVEN_REPO/com/codenameone/$AID/$CN1_VERSION" -maxdepth 1 -type f)
200+
ba_log "Local repo contents for $AID:$CN1_VERSION"
201+
printf '%s\n' "$FOUND" | sed 's/^/[build-android-app] M2: /'
202+
done
203+
204+
176205
# Force dependencies on com.codenameone:* to the detected version
177206
xvfb-run -a "${MAVEN_CMD[@]}" -q -f "$APP_DIR/pom.xml" \
178207
versions:use-dep-version \

0 commit comments

Comments
 (0)