Skip to content
This repository has been archived by the owner on Oct 9, 2020. It is now read-only.

Commit

Permalink
Merge branch 'stable' into shipping
Browse files Browse the repository at this point in the history
  • Loading branch information
championswimmer committed Mar 9, 2016
2 parents b0668ff + b750183 commit 14baaab
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 5 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
.travis.yml merge=ours
README.md merge=ours
9 changes: 6 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,12 @@ android:
- extra-android-m2repository
- sys-img-armeabi-v7a-$ANDROID_TARGET
script:
- "./gradlew build jacocoTestReport assembleAndroidTest"
- chmod a+x codestyle.sh
- "./codestyle.sh"
- ./gradlew build jacocoTestReport assembleAndroidTest
- echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
- emulator -avd test -no-skin -no-audio -no-window &
- android-wait-for-emulator
- adb shell setprop dalvik.vm.dexopt-flags v=n,o=v
- ./gradlew connectedCheck
notifications:
webhooks:
urls:
Expand Down
18 changes: 16 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[![Build Status](https://travis-ci.org/fossasia/open-event-android.svg)](https://travis-ci.org/fossasia/open-event-android)
[![codecov.io](https://codecov.io/github/fossasia/open-event-android/coverage.svg?branch=master)](https://codecov.io/github/fossasia/open-event-android?branch=master)
[![Build Status](https://travis-ci.org/fossasia/open-event-android.svg?branch=shipping)](https://travis-ci.org/fossasia/open-event-android)
[![codecov.io](https://codecov.io/github/fossasia/open-event-android/coverage.svg?branch=shipping)](https://codecov.io/github/fossasia/open-event-android?branch=shipping)
[![todofy badge](https://todofy.org/b/fossasia/open-event-android)](https://todofy.org/r/fossasia/open-event-android)
[![Join the chat at https://gitter.im/fossasia/open-event-android](https://badges.gitter.im/fossasia/open-event-android.svg)](https://gitter.im/fossasia/open-event-android?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

Expand Down Expand Up @@ -81,6 +81,20 @@ Before you begin, you should already have the Android Studio SDK downloaded and
- Timber
- Google Gson

## Branches and Contribution policy
We have the following branches
* **master**
All development goes on in this branch. If you're making a contribution,
you are supposed to make a pull request to _master_.
PRs to master must pass a build check and a unit-test (_app/src/test_) check on Travis
* **stable**
Every few days (after some contributions have come to _master_), we merge
master to stable. PRs from _master -> stable_ will have to pass a build check,
a unit-test check, AND a instrumentation test (_app/src/androidTest_) on Travis.
* **shipping**
This contains shipped code. After significant features/bugfixes are accumulated on stable, we make a version update, and make a release.
All tagged commits on _shipping_ branch will automatically generate a release on Github with a copy of ***fDroid-debug*** and ***GooglePlay-debug*** apks.

## A note about Codestyle
Please read our [CODESTYLE](CODESTYLE.md) carefully. Pull requests that do not match the style will be rejected.

Expand Down

0 comments on commit 14baaab

Please sign in to comment.