diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/ci/Dockerfile | 8 | ||||
| -rwxr-xr-x | scripts/generate-file-lists.js | 3 | ||||
| -rwxr-xr-x | scripts/generate-style-code.js | 3 |
3 files changed, 12 insertions, 2 deletions
diff --git a/scripts/ci/Dockerfile b/scripts/ci/Dockerfile index 648581044f..09ae07997d 100644 --- a/scripts/ci/Dockerfile +++ b/scripts/ci/Dockerfile @@ -40,7 +40,7 @@ RUN set -eu && apt-get install -y \ software-properties-common \ xvfb -RUN pip3 install cmake_format +RUN pip3 install cmake-format==0.5.5 # Linux dependencies RUN set -eu && apt-get install -y \ @@ -103,6 +103,12 @@ RUN set -eu \ "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2" \ "cmake;3.10.2.4988404" +# Install gcloud for Firebase testing +RUN set -eu \ + && echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list \ + && curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - \ + && apt-get update -y && apt-get install google-cloud-sdk -y + # Configure ccache RUN set -eu && /usr/sbin/update-ccache-symlinks diff --git a/scripts/generate-file-lists.js b/scripts/generate-file-lists.js index d1f5e77585..546ce38235 100755 --- a/scripts/generate-file-lists.js +++ b/scripts/generate-file-lists.js @@ -145,7 +145,8 @@ generateFileList('vendor/mapbox-base-files.json', 'vendor/mapbox-base/mapbox/geojson.hpp', 'vendor/mapbox-base/mapbox/jni.hpp', 'vendor/mapbox-base/mapbox/weak', - 'vendor/mapbox-base/mapbox/typewrapper' ], + 'vendor/mapbox-base/mapbox/typewrapper', + 'vendor/mapbox-base/mapbox/value'], vendorRegex, [ "include/*.hpp", "include/**/*.hpp", "include/**/*.h", "optional.hpp", ":!:include/jni/string_conversion.hpp" ]); generateFileList('vendor/polylabel-files.json', [ 'vendor/polylabel' ], vendorRegex, [ "include/**/*.hpp" ]); generateFileList('vendor/protozero-files.json', [ 'vendor/protozero' ], vendorRegex, [ "include/**/*.hpp" ]); diff --git a/scripts/generate-style-code.js b/scripts/generate-style-code.js index 1f26e6fd86..0aedba909b 100755 --- a/scripts/generate-style-code.js +++ b/scripts/generate-style-code.js @@ -36,6 +36,7 @@ global.expressionType = function (property) { case 'enum': return 'NumberType'; case 'string': + case 'image': // TODO: replace once we implement image expressions return 'StringType'; case 'color': return `ColorType`; @@ -68,6 +69,7 @@ global.evaluatedType = function (property) { case 'formatted': return 'expression::Formatted'; case 'string': + case 'image': // TODO: replace once we implement image expressions return 'std::string'; case 'enum': return (isLightProperty(property) ? 'Light' : '') + `${camelize(property.name)}Type`; @@ -166,6 +168,7 @@ global.defaultValue = function (property) { } case 'formatted': case 'string': + case 'image': // TODO: replace once we implement image expressions return JSON.stringify(property.default || ""); case 'enum': if (property.default === undefined) { |