diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-01-10 16:57:10 +0200 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-02-07 15:57:01 +0200 |
| commit | 75bc243de10729bc26cc020f9e3927600ec58374 (patch) | |
| tree | a7462526c22b2ec888ea8cd62a25d5dbbbe03805 /scripts/nitpick/submodule-pin.js | |
| parent | 489adb8d8713928fbbd1f511640417b1dd2aaa8a (diff) | |
| download | qtlocation-mapboxgl-upstream/tmpsantos-move_gl_js_to_vendor.tar.gz | |
[build] Move Mapbox GL JS to /vendorupstream/tmpsantos-move_gl_js_to_vendor
We need it for style code generation and style tests, but it is
confusing to have it on the root of the tree.
Diffstat (limited to 'scripts/nitpick/submodule-pin.js')
| -rwxr-xr-x | scripts/nitpick/submodule-pin.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/nitpick/submodule-pin.js b/scripts/nitpick/submodule-pin.js index 7ca129e096..a7ea4f901a 100755 --- a/scripts/nitpick/submodule-pin.js +++ b/scripts/nitpick/submodule-pin.js @@ -3,8 +3,8 @@ const nitpick = require('.'); const child_process = require('child_process'); // Make sure that the mapbox-gl-js submodule pin is up to date -const head = child_process.execSync('git -C mapbox-gl-js rev-parse HEAD').toString().trim(); -const revs = child_process.execSync(`git -C mapbox-gl-js branch -a --contains ${head}`).toString().split('\n'); +const head = child_process.execSync('git -C vendor/mapbox-gl-js rev-parse HEAD').toString().trim(); +const revs = child_process.execSync(`git -C vendor/mapbox-gl-js branch -a --contains ${head}`).toString().split('\n'); if (revs.indexOf(' remotes/origin/master') >= 0) { nitpick.ok(`mapbox-gl-js submodule pin is merged to master`); |