From 10ea329e1ff80495a0ccc964db42a05cda0f5a0f Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Mon, 21 Sep 2020 13:55:26 +0300 Subject: [build] s/master/main on GL JS Check if pinned against main. --- scripts/nitpick/submodule-pin.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/nitpick/submodule-pin.js b/scripts/nitpick/submodule-pin.js index 7ca129e096..72d8f673c6 100755 --- a/scripts/nitpick/submodule-pin.js +++ b/scripts/nitpick/submodule-pin.js @@ -6,8 +6,8 @@ const child_process = require('child_process'); 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'); -if (revs.indexOf(' remotes/origin/master') >= 0) { - nitpick.ok(`mapbox-gl-js submodule pin is merged to master`); +if (revs.indexOf(' remotes/origin/main') >= 0) { + nitpick.ok(`mapbox-gl-js submodule pin is merged to main`); } else { - nitpick.fail(`mapbox-gl-js submodule is pinned to ${head}, which isn't merged to master`); + nitpick.fail(`mapbox-gl-js submodule is pinned to ${head}, which isn't merged to main`); } -- cgit v1.2.1