diff options
author | Juha Alanen <juha.alanen@mapbox.com> | 2020-02-17 16:40:48 +0200 |
---|---|---|
committer | Juha Alanen <juha.alanen@mapbox.com> | 2020-02-18 14:31:51 +0200 |
commit | 2bfe8ca03f996f48d601e3f980a591ef9effe5fd (patch) | |
tree | 9401f90e6f44587b79f984352fd0388359aa39c7 | |
parent | 8fcbe817b184f046a6d58a14fa572d10ab579890 (diff) | |
download | qtlocation-mapboxgl-2bfe8ca03f996f48d601e3f980a591ef9effe5fd.tar.gz |
R&D: disable buildsupstream/jmalanen-ios-benchmark
-rw-r--r-- | circle.yml | 135 | ||||
-rw-r--r-- | platform/darwin/src/number_format.mm | 3 |
2 files changed, 3 insertions, 135 deletions
diff --git a/circle.yml b/circle.yml index 48e9e12df7..d149793f64 100644 --- a/circle.yml +++ b/circle.yml @@ -15,150 +15,17 @@ workflows: development: jobs: - sanity-checks - - android-benchmark-runner - - android-api-breakage - - android-render-test-runner - - android-unit-test-runner - ios-render-test-runner - ios-unit-test-runner - ios-benchmark-runner - - baselines: - requires: - - android-arm64-v8a-release - - android-armeabi-v7a-release - - android-render-test-runner - - android-x86-release - - android-x86_64-release - - linux-clang8-release - - linux-gcc8-release - - macos-xcode11-release - - ios-render-test-runner - - build-template: - name: android-armeabi-v7a-release - executor_name: ubuntu-disco - target_is_android: true - config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=/tmp/workspace/install/$CIRCLE_JOB -DCMAKE_TOOLCHAIN_FILE=/opt/android/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_CCACHE=/usr/bin/ccache -DANDROID_ABI=armeabi-v7a' - install: true - - build-template: - name: android-arm64-v8a-release - executor_name: ubuntu-disco - target_is_android: true - config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=/tmp/workspace/install/$CIRCLE_JOB -DCMAKE_TOOLCHAIN_FILE=/opt/android/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_CCACHE=/usr/bin/ccache -DANDROID_ABI=arm64-v8a' - build_params: '--target libmapbox-gl.so' - install: true - - build-template: - name: android-x86-release - executor_name: ubuntu-disco - target_is_android: true - config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=/tmp/workspace/install/$CIRCLE_JOB -DCMAKE_TOOLCHAIN_FILE=/opt/android/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_CCACHE=/usr/bin/ccache -DANDROID_ABI=x86' - build_params: '--target libmapbox-gl.so' - install: true - - build-template: - name: android-x86_64-release - executor_name: ubuntu-disco - target_is_android: true - config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=/tmp/workspace/install/$CIRCLE_JOB -DCMAKE_TOOLCHAIN_FILE=/opt/android/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_CCACHE=/usr/bin/ccache -DANDROID_ABI=x86_64' - build_params: '--target libmapbox-gl.so' - install: true - - build-template: - name: linux-gcc8-release - executor_name: ubuntu-disco - target_is_linux: true - config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=/tmp/workspace/install/$CIRCLE_JOB -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8' - install: true - metrics: true - style_tests: true - - build-template: - name: linux-gcc4.9-release - executor_name: ubuntu-disco - target_is_linux: true - requires: - - linux-gcc8-release - config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=gcc-4.9 -DCMAKE_CXX_COMPILER=g++-4.9' - build_params: '--target mbgl-glfw' - test_params: '-N -Q' - - build-template: - name: linux-gcc8-debug-coverage - executor_name: ubuntu-disco - target_is_linux: true - requires: - - linux-gcc8-release - config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8 -DCMAKE_BUILD_TYPE=Debug -DMBGL_WITH_COVERAGE=ON' - style_tests: true - - build-template: - name: linux-clang8-release - executor_name: ubuntu-disco - target_is_linux: true - config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=/tmp/workspace/install/$CIRCLE_JOB -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8' - install: true - metrics: true - style_tests: true - - build-template: - name: FIXME-linux-asan - executor_name: ubuntu-disco - target_is_linux: true - requires: - - sanity-checks - config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8 -DMBGL_WITH_SANITIZER=address' - test_params: '|| true' - style_tests: true - - build-template: - name: linux-tsan - executor_name: ubuntu-disco - target_is_linux: true - requires: - - sanity-checks - config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8 -DMBGL_WITH_SANITIZER=thread' - style_tests: true - - build-template: - name: FIXME-linux-valgrind - executor_name: ubuntu-disco - target_is_linux: true - config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8 -DCMAKE_CXX_FLAGS=-DSANITIZE' - test_params: '-j 4 -E "mbgl-node|gl-benchmark" -D ExperimentalMemCheck || true' - - build-template: - name: FIXME-linux-ubsan - executor_name: ubuntu-disco - target_is_linux: true - requires: - - sanity-checks - config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8 -DMBGL_WITH_SANITIZER=undefined' - test_params: '|| true' - style_tests: true - - build-template: - name: qt5-linux-gcc5-release - executor_name: ubuntu-disco - target_is_linux: true - config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=gcc-5 -DCMAKE_CXX_COMPILER=g++-5 -DMBGL_WITH_QT=ON' - - build-template: - name: qt5-macos-gcc5-release - executor_name: macos-11_1_0 - target_is_macos: true - requires: - - qt5-linux-gcc5-release - config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DMBGL_WITH_QT=ON -DCMAKE_PREFIX_PATH=$(echo /usr/local/Cellar/qt/5.*/lib/cmake)' - build-template: name: macos-xcode11-release - executor_name: macos-11_1_0 + executor_name: macos-11_3_1 target_is_macos: true config_params: '-G Ninja -DCMAKE_INSTALL_PREFIX=/tmp/workspace/install/$CIRCLE_JOB -DCMAKE_CXX_COMPILER_LAUNCHER=ccache' install: true metrics: true style_tests: true - - build-template: - name: macos-xcode11-debug - executor_name: macos-11_1_0 - target_is_macos: true - requires: - - macos-xcode11-release - config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=Debug' - style_tests: true - - build-template: - name: ios-xcode11-release - executor_name: macos-11_3_1 - target_is_macos: true - config_params: '-G Xcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_ARCHITECTURES=arm64e -DCMAKE_OSX_SYSROOT=iphoneos' - build_params: '--config Release' # # Executors: we currently support two executors, one based on Ubuntu 19.04 aka Disco diff --git a/platform/darwin/src/number_format.mm b/platform/darwin/src/number_format.mm index 86f16eb6dd..6e79bc5a38 100644 --- a/platform/darwin/src/number_format.mm +++ b/platform/darwin/src/number_format.mm @@ -27,7 +27,8 @@ std::string formatNumber(double number, const std::string& localeId, const std:: numberFormatter.maximumFractionDigits = 0; numberFormatter.numberStyle = NSNumberFormatterCurrencyStyle; } - NSString *formatted = [numberFormatter stringFromNumber:@(number)]; + NSString *formatted = [numberFormatter stringFromNumber:[NSNumber numberWithDouble:number]]; +// NSString *formatted = [numberFormatter stringFromNumber:@(number)]; std::string result = std::string([formatted UTF8String]); return result; } |