From a1b803f30737bed4a9160e6f52abd2f1987a13b2 Mon Sep 17 00:00:00 2001 From: Matija Nalis Date: Wed, 14 Jul 2021 02:41:30 +0200 Subject: [PATCH] indicate mnalis-westnordost-profiles-helium314 branch --- .github/workflows/build.yml | 4 ++-- CHANGES-mnalis.md | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 60bce127da..9dcadc034c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 diff --git a/CHANGES-mnalis.md b/CHANGES-mnalis.md index d278546392..d0830d4fdf 100644 --- a/CHANGES-mnalis.md +++ b/CHANGES-mnalis.md @@ -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 @@ -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