Skip to content

Commit

Permalink
indicate mnalis-westnordost-profiles-helium314 branch
Browse files Browse the repository at this point in the history
  • Loading branch information
mnalis committed Jul 14, 2021
1 parent 9b7b591 commit a1b803f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ jobs:
uses: jonasb/android-problem-matchers-action@v1
- name: Build the app
run: |
./gradlew assembleDebug && mv app/build/outputs/apk/debug/app-debug.apk app/build/outputs/apk/debug/StreetComplete-mnalis-helium314-noprofiles-debug.apk
./gradlew assembleDebug && mv app/build/outputs/apk/debug/app-debug.apk app/build/outputs/apk/debug/StreetComplete-mnalis-westnordost-profiles-helium314-debug.apk
- name: Upload apk
uses: actions/upload-artifact@v2
with:
name: debug apk
path: app/build/outputs/apk/debug/StreetComplete-mnalis-helium314-noprofiles-debug.apk
path: app/build/outputs/apk/debug/StreetComplete-mnalis-westnordost-profiles-helium314-debug.apk
7 changes: 5 additions & 2 deletions CHANGES-mnalis.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Changes in mnalis-helium314-noprofiles branch
## Changes in mnalis-westnordost-profiles-helium314 branch

This file details changes made in https://github.com/mnalis/StreetComplete/tree/mnalis
as modified from upstream https://github.com/streetcomplete/StreetComplete
Expand All @@ -14,10 +14,13 @@ From `mnalis` branch:
and which can be unhidden via `Restore hidden quests` preference)

Cherry-picked from `helium314` branch (from https://github.com/Helium314/StreetComplete/tree/mods):
* add phone number and website quests (commit a01c492bdc1f7385a7b83acd59fed5100fc55cdf)
* add phone number and website quests (commit a01c492bdc1f7385a7b83acd59fed5100fc55cdf), and fixes
* adjust dark theme (commit 3251e335c7839520a2eb95b120d6ad88d333f19c)
* move "none" answer for cycleway to more convenient position (commit 4812c692041d3c3b5ccd4dbbe249132c107317e1)

Also:
* uses https://github.com/streetcomplete/StreetComplete/tree/quest-profiles branch
instead of westnordost `master` branch (hopefully soon it will become master)

## TODO
* check https://github.com/Helium314/StreetComplete/tree/mods changes
Expand Down

0 comments on commit a1b803f

Please sign in to comment.