Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add dummy files for test pr. #20

Open
wants to merge 23 commits into
base: no_docker
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
89046f4
add dummy files for test pr.
brandonpage Jan 12, 2018
0f1d4b0
Merge branch 'no_docker' of github.com:brandonpage/SalesforceMobileSD…
brandonpage Jan 12, 2018
67a5b83
Test correct gem location.
Jan 12, 2018
4e88a8e
Merge branch 'fixed_ruby_cache' of github.com:brandonpage/SalesforceM…
brandonpage Jan 12, 2018
3f131bd
Downlad gradle dependencies durring setup so they are cached and shar…
Jan 12, 2018
9a6a09c
Merge branch 'fixed_ruby_cache' of github.com:brandonpage/SalesforceM…
brandonpage Jan 12, 2018
97e6299
Remove ruby cache. Install gems when danger is needed.
Jan 12, 2018
24c2c58
Merge branch 'fixed_ruby_cache' of github.com:brandonpage/SalesforceM…
brandonpage Jan 12, 2018
e013e1f
fix gradle cache key
Jan 12, 2018
bf5a78e
Merge branch 'fixed_ruby_cache' of github.com:brandonpage/SalesforceM…
brandonpage Jan 12, 2018
a6f1b9c
fix gradle cache key
Jan 12, 2018
0e3802d
Merge branch 'fixed_ruby_cache' of github.com:brandonpage/SalesforceM…
brandonpage Jan 12, 2018
1c7a040
fix gradle cache key
Jan 12, 2018
f7d0501
Merge branch 'fixed_ruby_cache' of github.com:brandonpage/SalesforceM…
brandonpage Jan 12, 2018
6642eac
fix gradle cache key
Jan 12, 2018
77d369a
fix gradle cache key
Jan 12, 2018
574aec5
fix gradle cache key
Jan 12, 2018
7de31b8
fix gradle cache key
Jan 12, 2018
ef46554
fix gradle cache key
Jan 12, 2018
446363b
fix gradle cache key
Jan 12, 2018
965412d
fix gradle cache key
Jan 12, 2018
5188138
fix gradle cache key
Jan 12, 2018
27c388d
Merge branch 'fixed_ruby_cache' of github.com:brandonpage/SalesforceM…
brandonpage Jan 12, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions .circleci/ci-helper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@ function envSetup {
cordova telemetry off

./install.sh
./gradlew androidDependencies

gem install bundler
gem install danger
gem install danger-junit
gem install danger-android_lint
gem install danger-jacoco
}

function printTestsToRun {
Expand Down Expand Up @@ -78,12 +85,6 @@ function runTests {

function runDanger {
if [ -n "$CIRCLE_PULL_REQUEST" ] && [[ ${LIBS_TO_TEST} == *"${CURRENT_LIB}"* ]]; then
gem install bundler
gem install danger
gem install danger-junit
gem install danger-android_lint
gem install danger-jacoco

if [ -z "${CURRENT_LIB}" ]; then
DANGER_GITHUB_API_TOKEN="c21349d8a97e1bf9cdd9""301fd949a83db862216b" danger --dangerfile=.circleci/Dangerfile_PR.rb --danger_id=PR-Check --verbose
else
Expand Down
57 changes: 42 additions & 15 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,35 +79,49 @@ aliases:
./gradlew :libs:SalesforceReact:assemble
when: always

- &android-lint
name: Run Android Lint
command: ./gradlew lint
when: always

- &gradle-cache-key
gradle-cache-v2-{{ checksum "build.gradle" }}-{{
checksum "gradle/wrapper/gradle-wrapper.properties" }}-{{
checksum "libs/SalesforceAnalytics/build.gradle" }}-{{
checksum "libs/SalesforceSDK/build.gradle" }}-{{
checksum "libs/SmartStore/build.gradle" }}-{{
checksum "libs/SmartSync/build.gradle" }}-{{
checksum "libs/SalesforceHybrid/build.gradle" }}-{{
checksum "libs/SalesforceReact/build.gradle" }}

- &restore-gradle-cache
keys:
- gradle-cache-{{ checksum "build.gradle" }}
- gradle-cache- # used if checksum fails
- *gradle-cache-key

- &restore-node-cache
keys:
- node-cache-{{ checksum "package.json" }}
- node-cache- # used if checksum fails

- &restore-ruby-cache
keys:
- ruby-cache
- ruby-gem-cache-{{ .BuildNum }}
- ruby-gem-cache-

- &save-gradle-cache
key: gradle-cache-{{ checksum "build.gradle" }}
key: *gradle-cache-key
paths:
- ".gradle"
- .gradle
- /home/circleci/.gradle

- &save-node-cache
key: node-cache-{{ checksum "package.json" }}
paths:
- "node_modules"
- node_modules

- &save-ruby-cache
key: ruby-cache
key: ruby-gem-cache-{{ .BuildNum }}
paths:
- "/opt/circleci/.rvm/gems"

- /home/circleci/.rubies

defaults: &defaults
working_directory: ~/SalesforceMobileSDK-Android
Expand Down Expand Up @@ -143,7 +157,7 @@ jobs:
- restore_cache: *restore-node-cache
- restore_cache: *restore-ruby-cache
- run: *setup-env
- run: *compile-libraries
- run: *android-lint
- save_cache: *save-gradle-cache
- save_cache: *save-node-cache
- save_cache: *save-ruby-cache
Expand All @@ -161,10 +175,13 @@ jobs:
- CURRENT_LIB: "SalesforceAnalytics"
steps:
- *attach_workspace
- restore_cache: *restore-gradle-cache
- restore_cache: *restore-ruby-cache
- run: *determine-tests-to-run
- run: *launch-emulator
- run: *wait-for-emulator
- run: *run-unit-tests
- save_cache: *save-gradle-cache
- store_artifacts:
path: libs/SalesforceAnalytics/build/reports/
destination: SalesforceAnalytics
Expand All @@ -178,10 +195,13 @@ jobs:
- CURRENT_LIB: "SalesforceSDK"
steps:
- *attach_workspace
- restore_cache: *restore-gradle-cache
- restore_cache: *restore-ruby-cache
- run: *determine-tests-to-run
- run: *launch-emulator
- run: *wait-for-emulator
- run: *run-unit-tests
- save_cache: *save-gradle-cache
- store_artifacts:
path: libs/SalesforceSDK/build/reports/
destination: SalesforceSDK
Expand All @@ -195,10 +215,13 @@ jobs:
- CURRENT_LIB: "SmartStore"
steps:
- *attach_workspace
- restore_cache: *restore-gradle-cache
- restore_cache: *restore-ruby-cache
- run: *determine-tests-to-run
- run: *launch-emulator
- run: *wait-for-emulator
- run: *run-unit-tests
- save_cache: *save-gradle-cache
- store_artifacts:
path: libs/SmartStore/build/reports/
destination: SmartStore
Expand All @@ -212,10 +235,13 @@ jobs:
- CURRENT_LIB: "SmartSync"
steps:
- *attach_workspace
- restore_cache: *restore-gradle-cache
- restore_cache: *restore-ruby-cache
- run: *determine-tests-to-run
- run: *launch-emulator
- run: *wait-for-emulator
- run: *run-unit-tests
- save_cache: *save-gradle-cache
- store_artifacts:
path: libs/SmartSync/build/reports/
destination: SmartSync
Expand All @@ -229,10 +255,13 @@ jobs:
- CURRENT_LIB: "SalesforceHybrid"
steps:
- *attach_workspace
- restore_cache: *restore-gradle-cache
- restore_cache: *restore-ruby-cache
- run: *determine-tests-to-run
- run: *launch-emulator
- run: *wait-for-emulator
- run: *run-unit-tests
- save_cache: *save-gradle-cache
- store_artifacts:
path: libs/SalesforceHybrid/build/reports/
destination: SalesforceHybrid
Expand Down Expand Up @@ -264,19 +293,19 @@ jobs:
- checkout
- restore_cache: *restore-gradle-cache
- restore_cache: *restore-node-cache
- restore_cache: *restore-ruby-cache
- run: *setup-env
- save_cache: *save-gradle-cache
- save_cache: *save-node-cache
- save_cache: *save-ruby-cache
- run: *launch-emulator
- run: *android-lint
- run: *wait-for-emulator
- run: *test-salesforce-analytics
- run: *test-salesforce-sdk
- run: *test-smart-store
- run: *test-smart-sync
- run: *test-salesforce-hybrid
- run: *build-salesforce-react
- save_cache: *save-gradle-cache
- store_artifacts:
path: libs/SalesforceAnalytics/build/reports/
destination: SalesforceAnalytics
Expand Down Expand Up @@ -309,10 +338,8 @@ jobs:
- checkout
- restore_cache: *restore-gradle-cache
- restore_cache: *restore-node-cache
- restore_cache: *restore-ruby-cache
- run: *setup-env
- save_cache: *save-node-cache
- save_cache: *save-ruby-cache
- run: *compile-libraries
- store_artifacts:
path: libs/SalesforceAnalytics/build/outputs/aar/
Expand Down
1 change: 1 addition & 0 deletions libs/SalesforceHybrid/another.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
asdfsdf
1 change: 1 addition & 0 deletions libs/SalesforceSDK/test.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
asdfasdfa