[tests] Bump GL JS to run render test for #15139

mapbox/mapbox-gl-js#8510
mapbox · Jul 19, 2019 · 1aa4776 · 1aa4776
1 parent fe9d463
commit 1aa4776
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 1 deletion.
diff --git a/mapbox-gl-js b/mapbox-gl-js
diff --git a/platform/android/scripts/generate-style-code.js b/platform/android/scripts/generate-style-code.js
@@ -6,6 +6,11 @@ const ejs = require('ejs');
 const spec = require('../../../scripts/style-spec');
 const _ = require('lodash');
 
+// FIXME: https://github.com/mapbox/mapbox-gl-native/issues/15008
+delete spec.layout_circle["circle-sort-key"]
+delete spec.layout_line["line-sort-key"]
+delete spec.layout_fill["fill-sort-key"]
+
 require('../../../scripts/style-code');
 
 // Specification parsing //

diff --git a/platform/darwin/scripts/generate-style-code.js b/platform/darwin/scripts/generate-style-code.js
@@ -14,6 +14,11 @@ const suffix = 'StyleLayer';
 
 let spec = _.merge(require('../../../scripts/style-spec'), require('./style-spec-overrides-v8.json'));
 
+// FIXME: https://github.com/mapbox/mapbox-gl-native/issues/15008
+delete spec.layout_circle["circle-sort-key"]
+delete spec.layout_line["line-sort-key"]
+delete spec.layout_fill["fill-sort-key"]
+
 // Rename properties and keep `original` for use with setters and getters
 _.forOwn(cocoaConventions, function (properties, kind) {
  _.forOwn(properties, function (newName, oldName) {

diff --git a/platform/node/test/ignores.json b/platform/node/test/ignores.json
@@ -98,6 +98,9 @@
  "render-tests/remove-feature-state/vector-source": "https://github.com/mapbox/mapbox-gl-native/issues/12413",
  "render-tests/regressions/mapbox-gl-js#8026": "skip - js specific",
  "render-tests/fill-extrusion-geometry/linestring": "https://github.com/mapbox/mapbox-gl-native/pull/14240",
+ "render-tests/circle-sort-key/literal": "https://github.com/mapbox/mapbox-gl-native/issues/15008",
+ "render-tests/fill-sort-key/literal": "https://github.com/mapbox/mapbox-gl-native/issues/15008",
+ "render-tests/line-sort-key/literal": "https://github.com/mapbox/mapbox-gl-native/issues/15008",
  "query-tests/remove-feature-state/default": "https://github.com/mapbox/mapbox-gl-native/issues/12413",
  "query-tests/fill-extrusion/base-in": "https://github.com/mapbox/mapbox-gl-native/issues/13139",
  "query-tests/fill-extrusion/box-in": "https://github.com/mapbox/mapbox-gl-native/issues/13139",

diff --git a/scripts/generate-style-code.js b/scripts/generate-style-code.js
@@ -6,6 +6,11 @@ const ejs = require('ejs');
 const spec = require('./style-spec');
 const colorParser = require('csscolorparser');
 
+// FIXME: https://github.com/mapbox/mapbox-gl-native/issues/15008
+delete spec.layout_circle["circle-sort-key"]
+delete spec.layout_line["line-sort-key"]
+delete spec.layout_fill["fill-sort-key"]
+
 require('./style-code');
 
 function parseCSSColor(str) {