[android] initialize vendor submodules as a CI step
This commit is contained in:
committed by
Łukasz Paczos
parent
2c2c67aedf
commit
3cf24f3329
@@ -534,6 +534,9 @@ jobs:
|
||||
MBGL_ANDROID_STL: << parameters.stl >>
|
||||
steps:
|
||||
- install-dependencies: { gradle: true }
|
||||
- run:
|
||||
name: Initialize vendor submodules
|
||||
command: git submodule update --init platform/android/vendor
|
||||
- run:
|
||||
name: Android nitpick
|
||||
command: make run-android-nitpick
|
||||
@@ -598,6 +601,9 @@ jobs:
|
||||
IS_LOCAL_DEVELOPMENT: false
|
||||
steps:
|
||||
- install-dependencies: { gradle: true }
|
||||
- run:
|
||||
name: Initialize vendor submodules
|
||||
command: git submodule update --init platform/android/vendor
|
||||
- run:
|
||||
name: Android nitpick
|
||||
command: make run-android-nitpick
|
||||
|
||||
@@ -14,11 +14,6 @@ task androidNitpick {
|
||||
println "Running android nitpick script"
|
||||
|
||||
println "Verify vendor submodule pins"
|
||||
exec {
|
||||
workingDir = "${rootDir}"
|
||||
commandLine "git", "submodule", "update", "--init", "--recursive", "vendor"
|
||||
ignoreExitValue = true
|
||||
}
|
||||
verifyVendorSubmodulePin(MAPBOX_JAVA_DIR, MAPBOX_JAVA_TAG_PREFIX, versions.mapboxServices)
|
||||
verifyVendorSubmodulePin(MAPBOX_TELEMETRY_DIR, MAPBOX_TELEMETRY_TAG_PREFIX, versions.mapboxTelemetry)
|
||||
verifyVendorSubmodulePin(MAPBOX_GESTURES_DIR, MAPBOX_GESTURES_TAG_PREFIX, versions.mapboxGestures)
|
||||
@@ -26,6 +21,7 @@ task androidNitpick {
|
||||
}
|
||||
|
||||
private def verifyVendorSubmodulePin(def dir, def prefix, def version) {
|
||||
println "Verify vendor submodule pin: ${dir} (${prefix + version})"
|
||||
exec {
|
||||
workingDir = "${rootDir}/vendor/${dir}"
|
||||
commandLine "git", "fetch", "-t"
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
task updateVendorSubmodules {
|
||||
doLast {
|
||||
"git submodule update --init --recursive vendor".execute()
|
||||
exec {
|
||||
workingDir = "${rootDir}"
|
||||
commandLine "git", "submodule", "update", "--init", "vendor"
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user