diff options
| author | Łukasz Paczos <lukas.paczos@gmail.com> | 2019-02-21 12:57:29 +0100 |
|---|---|---|
| committer | Łukasz Paczos <lukasz.paczos@mapbox.com> | 2019-02-21 15:23:08 +0100 |
| commit | 3cf24f3329bb552c35b4f64e0edcdff72aa4f8b7 (patch) | |
| tree | 7b16f8d8cea5fbe0b23045258187cb66fe52a97a | |
| parent | 2c2c67aedfd9bf9a47d3f4c73137d08efde2f622 (diff) | |
| download | qtlocation-mapboxgl-3cf24f3329bb552c35b4f64e0edcdff72aa4f8b7.tar.gz | |
[android] initialize vendor submodules as a CI step
| -rw-r--r-- | circle.yml | 6 | ||||
| -rw-r--r-- | platform/android/gradle/android-nitpick.gradle | 6 | ||||
| -rw-r--r-- | platform/android/gradle/gradle-update-vendor-modules.gradle | 5 |
3 files changed, 11 insertions, 6 deletions
diff --git a/circle.yml b/circle.yml index 6424205279..28d1e39e68 100644 --- a/circle.yml +++ b/circle.yml @@ -535,6 +535,9 @@ jobs: 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 - run: @@ -599,6 +602,9 @@ jobs: 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 - run: diff --git a/platform/android/gradle/android-nitpick.gradle b/platform/android/gradle/android-nitpick.gradle index 6ed03e8aaa..f8e4a47b0b 100644 --- a/platform/android/gradle/android-nitpick.gradle +++ b/platform/android/gradle/android-nitpick.gradle @@ -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" diff --git a/platform/android/gradle/gradle-update-vendor-modules.gradle b/platform/android/gradle/gradle-update-vendor-modules.gradle index f2305eb7a5..e215450ec1 100644 --- a/platform/android/gradle/gradle-update-vendor-modules.gradle +++ b/platform/android/gradle/gradle-update-vendor-modules.gradle @@ -1,5 +1,8 @@ task updateVendorSubmodules { doLast { - "git submodule update --init --recursive vendor".execute() + exec { + workingDir = "${rootDir}" + commandLine "git", "submodule", "update", "--init", "vendor" + } } }
\ No newline at end of file |