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

Merge back release branch #906

Merged
merged 15 commits into from
Jul 1, 2020
Merged

Merge back release branch #906

merged 15 commits into from
Jul 1, 2020

Conversation

msfjarvis
Copy link
Member

📢 Type of change

  • Bugfix
  • New feature
  • Enhancement
  • Refactoring
  • Dependency updates
  • Release catchup

📜 Description

Merge back release and bump version code for snapshots.

💡 Motivation and Context

People on snapshot builds will get automatically 'updated' to Play Store releases if the version code is lower, which it currently is.

💚 How did you test it?

gradle clean assemble testDebug connectedCheck passes.

📝 Checklist

  • I formatted the code with the IDE's reformat action (Ctrl + Shift + L/Cmd + Shift + L)
  • I reviewed submitted code
  • I added a CHANGELOG entry if applicable

🔮 Next steps

📸 Screenshots / GIFs

FabianHenneke and others added 14 commits June 25, 2020 00:27
I verified the following:

* Store: F-Droid
* Package hash: wi2iuVvK/WYZUzd2g0Qzn9ef3kAisQURZ8U1WSMTkcM=
* Based on: Firefox
* Actively maintained: https://git.savannah.gnu.org/cgit/gnuzilla.git/log/?h=68
* Multi-origin method: WebView
* Save support: no

(cherry picked from commit 8a90ba4)
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
(cherry picked from commit d5310bd)
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
(cherry picked from commit 6b5984d)
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
* Use remembered credential even if it is empty

Should fix #875.

* .isNull() --> == null

* Update relnotes

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* Reword relnotes

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* 2019 it is

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

Co-authored-by: Harsh Shandilya <me@msfjarvis.dev>
(cherry picked from commit b60c5fb)
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
(cherry picked from commit 889208b)
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
* Revert "github: run instrumentation tests against API 30 (#847)"

API 30 is too flaky to be a part of our active test suite.

This reverts commit bf33fb2.

* github: bump android-emulator-runner action

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
(cherry picked from commit eb31385)
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
(cherry picked from commit 57f125a)
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
@msfjarvis msfjarvis added this to the 1.10.0 milestone Jul 1, 2020
@msfjarvis
Copy link
Member Author

I've setup separate branch protection rules now to let develop have merge commits. It'll make things a bit annoying when #900 lands and we have to change required checks on two separate rules but that's the only reasonable solution I have for now.

* origin/release:
  Bump version
  Prepare release 1.9.2
  update changelog
  Workaround to prevent crash on first run (#898)
  build: bump version
  Prepare release 1.9.1
  Backport Actions fixes (#894)
  Remove API 30 from pull request test matrix (#879)
  CHANGELOG: reword to better clarify fixes
  Prevent cached passwords from being wiped (#884)
  Use remembered credential even if it is empty (#880)
  Reset SSH passphrase after SSH key import (#885)
  Add relnotes for #871 (#872)
  Add org.gnu.icecat as a trusted multi-origin browser (#871)

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
@msfjarvis msfjarvis merged commit f49d9c3 into android-password-store:develop Jul 1, 2020
@msfjarvis msfjarvis deleted the release-catchup branch July 1, 2020 07:56
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants