From e42a7320aed2e53fbbe2fd047a8c041e0e59842f Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Thu, 20 Jun 2019 13:17:19 +0100 Subject: [PATCH 1/8] #1200 explain how the branching model will work post 2.5 --- CONTRIBUTING.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d9119491d..23df7e675 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -40,4 +40,17 @@ Our process for accepting changes operates by [Pull Request (PR)](https://help.g 1. Once you have integrated comments, or waited for feedback, a Lieutenant should merge your changes in! +### Branching + +Our branching strategy is based on [this article](https://nvie.com/posts/a-successful-git-branching-model/) which we suggest you read. + ++ **master** a history of releases, once merged to from develop and tagged we create a release on the play store & GitHub releases. ++ **develop** the actively worked on next release of the app, what we branch off of while working on new features and what we merge into upon feature completion ++ **feature/** or feature// any branch under this directory is an actively developed feature, feature branches culminate in a PR, are merged and deleted ++ **hotfix/** or hotfix// any branch under this directory is an urgent fix to production, once a hotfix is merged to master (and tagged for release) it must also be merged to develop before being deleted + +All branches should have distinct history and should be visually easy to follow, for this reason only preform merge commits when merging code either by PR or when synchronising. + +Rebasing should be avoided. + _These guidelines are based on [Tools for Government Data Archiving](https://github.com/edgi-govdata-archiving/overview/blob/master/CONTRIBUTING.md)'s._ From c6491281e2a70e2eda4587ac6c6b8b4c86ae98ff Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Mon, 24 Jun 2019 16:00:53 +0100 Subject: [PATCH 2/8] #1200 remove hotfix line, expnd feature line --- CONTRIBUTING.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 23df7e675..c90c239ea 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -46,8 +46,7 @@ Our branching strategy is based on [this article](https://nvie.com/posts/a-succe + **master** a history of releases, once merged to from develop and tagged we create a release on the play store & GitHub releases. + **develop** the actively worked on next release of the app, what we branch off of while working on new features and what we merge into upon feature completion -+ **feature/** or feature// any branch under this directory is an actively developed feature, feature branches culminate in a PR, are merged and deleted -+ **hotfix/** or hotfix// any branch under this directory is an urgent fix to production, once a hotfix is merged to master (and tagged for release) it must also be merged to develop before being deleted ++ **feature/** or feature// any branch under this directory is an actively developed feature, feature branches culminate in a PR, are merged and deleted. Typically a feature branch is off of develop and into develop but in rare scenarios if there is an issue in production a branch may be made off master to fix this issue, this type of feature branch must be merged to develop and master before being deleted. All branches should have distinct history and should be visually easy to follow, for this reason only preform merge commits when merging code either by PR or when synchronising. From c21703a4b3e0bd4c9a2ceaf684778179b8e54eb6 Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Tue, 25 Jun 2019 13:25:32 +0100 Subject: [PATCH 3/8] #1226 create stalebot configuration --- .github/stale.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .github/stale.yml diff --git a/.github/stale.yml b/.github/stale.yml new file mode 100644 index 000000000..6b645821a --- /dev/null +++ b/.github/stale.yml @@ -0,0 +1,7 @@ +daysUntilStale: 60 +daysUntilClose: false +staleLabel: stale +markComment: > + This issue has been automatically marked as stale because it has not had + recent activity. It will be now be reviewed manually. Thank you + for your contributions. From 51d1729d51c89872cd6bd0b174ecdf3967376e1f Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Wed, 26 Jun 2019 11:27:43 +0100 Subject: [PATCH 4/8] Escape angle brackets --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c90c239ea..9f12b8f10 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -46,7 +46,7 @@ Our branching strategy is based on [this article](https://nvie.com/posts/a-succe + **master** a history of releases, once merged to from develop and tagged we create a release on the play store & GitHub releases. + **develop** the actively worked on next release of the app, what we branch off of while working on new features and what we merge into upon feature completion -+ **feature/** or feature// any branch under this directory is an actively developed feature, feature branches culminate in a PR, are merged and deleted. Typically a feature branch is off of develop and into develop but in rare scenarios if there is an issue in production a branch may be made off master to fix this issue, this type of feature branch must be merged to develop and master before being deleted. ++ **feature/** or feature/\/ any branch under this directory is an actively developed feature, feature branches culminate in a PR, are merged and deleted. Typically a feature branch is off of develop and into develop but in rare scenarios if there is an issue in production a branch may be made off master to fix this issue, this type of feature branch must be merged to develop and master before being deleted. All branches should have distinct history and should be visually easy to follow, for this reason only preform merge commits when merging code either by PR or when synchronising. From c0e930eb95c4ad7f702636df1b4db103ab964874 Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Wed, 3 Jul 2019 13:02:39 +0100 Subject: [PATCH 5/8] Fix build with lower target emulator --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 231441fb0..1568bed51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ sudo: required env: global: - - ANDROID_TARGET=android-22 + - ANDROID_TARGET=android-21 - ANDROID_ABI=armeabi-v7a if: type != push OR tag IS present From 9ff08d1f24c95cc8fa206e592791212d3ea733cf Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Wed, 3 Jul 2019 14:05:20 +0100 Subject: [PATCH 6/8] #1251 add config for prs --- .github/stale.yml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/stale.yml b/.github/stale.yml index 6b645821a..8540acf71 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -1,7 +1,17 @@ -daysUntilStale: 60 daysUntilClose: false staleLabel: stale -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be now be reviewed manually. Thank you - for your contributions. + +issues: + daysUntilStale: 60 + markComment: > + This issue has been automatically marked as stale because it has not had + recent activity. It will be now be reviewed manually. Thank you + for your contributions. + +pulls: + daysUntilStale: 7 + markComment: > + This pull request has been automatically marked as stale because it has not had + recent activity. It will be now be reviewed manually. Thank you + for your contributions. + From 6c5bca88c3ad77b521090a1e7f39c6ed3637af4a Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Wed, 3 Jul 2019 14:14:12 +0100 Subject: [PATCH 7/8] cut out preomptimisation of starting emulator before script --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1568bed51..0e5e21484 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,12 +47,10 @@ android: licenses: - ".+" -before_script: - - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI -c 100M - - emulator -avd test -no-audio -no-window & - script: - ./gradlew lintKiwixDebug jacocoTestKiwixDebugUnitTestReport + - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI -c 100M + - emulator -avd test -no-audio -no-window & - android-wait-for-emulator - adb shell input keyevent 82 & - adb -e logcat *:D > logcat.log & From acbba3eecc2b55460b6f9eac5b064b7b95c45a98 Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Wed, 3 Jul 2019 14:34:32 +0100 Subject: [PATCH 8/8] Use memory conservation --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0e5e21484..42dab2f4c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,8 @@ sudo: required env: global: + # switch glibc to a memory conserving mode + - MALLOC_ARENA_MAX=2 - ANDROID_TARGET=android-21 - ANDROID_ABI=armeabi-v7a