Skip to content
This repository has been archived by the owner. It is now read-only.

Fixing telemetry + cocoapods setup #265

Merged
merged 9 commits into from Mar 20, 2019
@@ -2,7 +2,8 @@ source 'https://rubygems.org'

gem 'danger', :git => 'git@github.com:danger/danger.git', :branch => 'master'
gem 'danger-swiftlint'
gem 'cocoapods', '1.5.3'
gem 'fastlane'

gem "fastlane"
plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
eval_gemfile(plugins_path) if File.exist?(plugins_path)
@@ -33,7 +33,7 @@ Building the code
```
1. Install [cocoadpods](https://cocoapods.org/)
```shell
sudo gem install cocoapods
bundle install
```
1. Fork the repository https://github.com/ghostery/browser-ios
1. Clone the forked repository:
@@ -46,7 +46,7 @@ Building the code
sh ./bootstrap.sh
npm install
npm run bundle
pod install
bundle exec pod install
```
1. Open `Client.xcworkspace` in Xcode.
1. Build the `Fennec` scheme in Xcode.
@@ -96,4 +96,4 @@ npm run build
### Commits
* Each commit should have a single clear purpose. If a commit contains multiple unrelated changes, those changes should be split into separate commits.
* If a commit requires another commit to build properly, those commits should be squashed.
* Follow-up commits for any review comments should be squashed. Do not include "Fixed PR comments", merge commits, or other "temporary" commits in pull requests.
* Follow-up commits for any review comments should be squashed. Do not include "Fixed PR comments", merge commits, or other "temporary" commits in pull requests.
@@ -12,40 +12,38 @@ steps:
displayName: Clone Tests

- bash: |
set -x
sudo xcode-select --switch /Applications/Xcode_10.1.app
xcrun simctl create Test-iPhone6s com.apple.CoreSimulator.SimDeviceType.iPhone-6s com.apple.CoreSimulator.SimRuntime.iOS-12-1 > cliqz-mobile-tests/dev.id
xcrun simctl boot $(cat cliqz-mobile-tests/dev.id)
sleep 10
xcrun simctl list
displayName: 'Create a Test Simulator'

- script: $(which carthage) bootstrap --verbose --platform ios --color auto --cache-builds
displayName: 'carthage bootstrap'

- task: NodeTool@0
inputs:
versionSpec: '9.11.2'

- bash: |
set -x
npm i -g npm@6.5
/usr/local/bin/npm ci
/usr/local/bin/npm run bundle-ghostery
displayName: 'install and build react native'

- task: Npm@1
displayName: 'npm install'
inputs:
command: 'install'
- script: $(which carthage) bootstrap --verbose --platform ios --color auto --cache-builds
displayName: 'carthage bootstrap'

- task: CocoaPods@0
displayName: 'pod install --repo-update'
inputs:
forceRepoUpdate: true

- task: Npm@1
displayName: 'npm run bundle-ghostery'
inputs:
command: 'custom'
customCommand: 'run bundle-ghostery'

- script: xcodebuild -workspace Client.xcworkspace -scheme "Fennec" -sdk iphonesimulator -destination "platform=iOS Simulator,OS=12.1,name=Test-iPhone6s" OTHER_SWIFT_FLAGS='$(value) -DAUTOMATION' ONLY_ACTIVE_ARCH=NO -derivedDataPath clean build test
displayName: 'Xcode Build on Test iPhone 6s Simulator'

- bash: |
set -x
cd cliqz-mobile-tests
export DEV_NAME="Test-iPhone6s"
export DEV_UDID=$(cat dev.id)
ProTip! Use n and p to navigate between commits in a pull request.