diff options
| author | Jason Wray <jason@mapbox.com> | 2017-10-24 17:22:56 -0400 |
|---|---|---|
| committer | Jason Wray <jason@mapbox.com> | 2017-10-24 17:22:56 -0400 |
| commit | d8959ae8765675f02846d3393a5286074711a65e (patch) | |
| tree | faec2d40d64f8f58c02a68a9a825f5cbd18e9412 | |
| parent | b6e2d36b9cb1333aa478292b93400c2d80cd600d (diff) | |
| download | qtlocation-mapboxgl-d8959ae8765675f02846d3393a5286074711a65e.tar.gz | |
Switch away from fastlane scane to direct makefile
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | circle.yml | 48 |
2 files changed, 19 insertions, 37 deletions
@@ -222,6 +222,14 @@ iproj: $(IOS_PROJ_PATH) ios-test: $(IOS_PROJ_PATH) set -o pipefail && $(IOS_XCODEBUILD_SIM) -scheme 'CI' test $(XCPRETTY) +.PHONY: ios-sanitize-address +ios-sanitize-address: $(IOS_PROJ_PATH) + set -o pipefail && $(IOS_XCODEBUILD_SIM) -scheme 'CI' -enableAddressSanitizer YES test $(XCPRETTY) + +.PHONY: ios-sanitize-thread +ios-sanitize-thread: $(IOS_PROJ_PATH) + set -o pipefail && $(IOS_XCODEBUILD_SIM) -scheme 'CI' -enableThreadSanitizer YES test $(XCPRETTY) + .PHONY: ipackage ipackage: $(IOS_PROJ_PATH) FORMAT=$(FORMAT) BUILD_DEVICE=$(BUILD_DEVICE) SYMBOLS=$(SYMBOLS) \ diff --git a/circle.yml b/circle.yml index e6b4b4b59a..88ba60e533 100644 --- a/circle.yml +++ b/circle.yml @@ -100,14 +100,16 @@ step-library: run: name: Build qt-test command: make qt-test - - &build-iproj - run: - name: Build iproj - command: make iproj - &build-ios-test run: - name: Build core and iOS SDK for testing - command: fastlane scan --build_for_testing --buildlog_path "test_output/build" + name: Build ios-test + command: make ios-test + + + - &check-public-symbols + run: + name: Check public symbols + command: make check-public-symbols - &install-ios-dependencies @@ -116,7 +118,6 @@ step-library: command: | brew install cmake brew install ccache - sudo gem install fastlane --no-document - &run-node-tests @@ -154,10 +155,6 @@ step-library: store_artifacts: path: mapbox-gl-js/test/integration/render-tests/index-recycle-map.html destination: render-tests - - &upload-ios-artifacts - store_artifacts: - path: test_output - destination: test_output jobs: # ------------------------------------------------------------------------------ @@ -619,10 +616,6 @@ jobs: macos: xcode: "9.0" environment: - SCAN_WORKSPACE: platform/ios/ios.xcworkspace - SCAN_SCHEME: CI - SCAN_CONFIGURATION: Debug - SCAN_DEVICE: iPhone 7 HOMEBREW_NO_AUTO_UPDATE: 1 steps: - checkout @@ -630,15 +623,8 @@ jobs: - *generate-cache-key - *restore-cache - *reset-ccache-stats - - *build-iproj - *build-ios-test - - run: - name: List available simulators - command: xcrun simctl list - - run: - name: Run SDK unit tests - command: fastlane scan --test_without_building --buildlog_path "test_output/tests" - - *upload-ios-artifacts + - *check-public-symbols - *show-ccache-stats - *save-cache @@ -647,10 +633,6 @@ jobs: macos: xcode: "9.0" environment: - SCAN_WORKSPACE: platform/ios/ios.xcworkspace - SCAN_SCHEME: CI - SCAN_CONFIGURATION: Debug - SCAN_DEVICE: iPhone 7 HOMEBREW_NO_AUTO_UPDATE: 1 steps: - checkout @@ -658,11 +640,9 @@ jobs: - *generate-cache-key - *restore-cache - *reset-ccache-stats - - *build-iproj - run: name: Build and run SDK unit tests with address sanitizer - command: fastlane scan --address_sanitizer --buildlog_path "test_output/tests" - - *upload-ios-artifacts + command: make ios-sanitize-address - *show-ccache-stats - *save-cache @@ -671,10 +651,6 @@ jobs: macos: xcode: "9.0" environment: - SCAN_WORKSPACE: platform/ios/ios.xcworkspace - SCAN_SCHEME: CI - SCAN_CONFIGURATION: Debug - SCAN_DEVICE: iPhone 7 HOMEBREW_NO_AUTO_UPDATE: 1 steps: - checkout @@ -682,10 +658,8 @@ jobs: - *generate-cache-key - *restore-cache - *reset-ccache-stats - - *build-iproj - run: name: Build and run SDK unit tests with thread sanitizer - command: fastlane scan --thread_sanitizer --buildlog_path "test_output/tests" - - *upload-ios-artifacts + command: make ios-sanitize-thread - *show-ccache-stats - *save-cache |