diff options
-rw-r--r-- | .github/CODEOWNERS | 7 | ||||
-rw-r--r-- | circle.yml | 4 | ||||
-rw-r--r-- | package.json | 4 | ||||
-rwxr-xr-x | scripts/nitpick/submodule-pin.js | 6 |
4 files changed, 6 insertions, 15 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 66baad21d6..81c159d6c4 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,6 +1 @@ -* @mapbox/gl-native - -# Apple -/platform/ios/ @mapbox/maps-ios-reviewers -/platform/macos/ @mapbox/maps-ios-reviewers -/platform/darwin/ @mapbox/maps-ios-reviewers +* @mapbox/gl-native
\ No newline at end of file diff --git a/circle.yml b/circle.yml index 977d138127..0cd2ae2547 100644 --- a/circle.yml +++ b/circle.yml @@ -337,10 +337,6 @@ commands: command: | cd build find . -type f -iname *.gcda -exec gcov -p -b {} \; - - run: - name: Upload coverage results to codecov.io - command: | - bash <(curl -sSfL https://codecov.io/bash) -X gcov || echo 'Codecov failed to upload' publish-coverage-metrics: steps: - run: diff --git a/package.json b/package.json index adda5fef5b..9ec1f48332 100644 --- a/package.json +++ b/package.json @@ -27,11 +27,11 @@ "csscolorparser": "~1.0.2", "d3-queue": "3.0.7", "diff": "4.0.1", - "ejs": "^2.5.7", + "ejs": "^3.1.7", "esm": "~3.0.84", "express": "^4.11.1", "json-stringify-pretty-compact": "^2.0.0", - "jsonwebtoken": "^8.3.0", + "jsonwebtoken": "^9.0.0", "lodash": "^4.16.4", "lodash.template": "4.5.0", "mapbox-gl-styles": "2.0.2", 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`); } |