Skip to content

Merge upstream AnkiDroid main (2026-10-31) - #82

Merged
float3 merged 2 commits into
ankiquestfrom
merge-upstream-2026-10-31
Oct 31, 2026
Merged

float3 merged 2 commits into
ankiquestfrom
merge-upstream-2026-10-31

Conversation

@float3

@float3 float3 commented Oct 31, 2026

Copy link
Copy Markdown
Owner

Merges the 1 commit on upstream AnkiDroid main since #73: upstream moved the macOS unit test job from macos-14 to macos-15 ahead of the macOS 14 runner retirement.

tests_unit.yml conflicted because the fork already runs that job on macos-latest for the same reason. Kept macos-latest and took upstream's comment update.

criticalAY and others added 2 commits October 30, 2026 20:43
GitHub retires the macOS 14 runner images on 2 November 2026, and
during its brownouts the macOS JUnit job is cancelled before it starts.
macos-15 is still Apple Silicon, and the check keeps its "macos" name.

actions/runner-images#13518

Assisted-by: Claude Opus 5.5
# Conflicts:
#	.github/workflows/tests_unit.yml
@github-actions

Copy link
Copy Markdown

Snapshot diff report vs ankiquest. Open screenshot-diff for diffs.

  • AnkiquestHomeScreenshotTest: 1 change
  • CustomStudyScreenshotTest: 2 changes
  • DeckPickerScreenshotTest: 4 changes
  • DeckPickerTabletScreenshotTest: 1 change
  • NavigationDrawerScreenshotTest: 1 change
  • ReviewRemindersScreenshotTest: 5 changes
All 14 changed screenshots

AnkiquestHomeScreenshotTest

  • today_320dp_compare.png

CustomStudyScreenshotTest

  • tablet_unavailable_deck_compare.png
  • unavailable_deck_compare.png

DeckPickerScreenshotTest

  • bottom_navigation_keyboard_open_scrolled_to_bottom_compare.png
  • deck_list_after_dismissing_create_deck_dialog_compare.png
  • hierarchy_lines_collapsed_compare.png
  • keyboard_open_scrolled_to_bottom_compare.png

DeckPickerTabletScreenshotTest

  • keyboard_open_compare.png

NavigationDrawerScreenshotTest

  • navigationDrawer_compare.png

ReviewRemindersScreenshotTest

  • studyOptionsFragmentHost_scheduleReminders_compare.png
  • studyOptionsFragmentHost_systemBars_compare.png
  • studyOptionsFragmentHost_systemBars_scrolledToEnd_compare.png
  • studyOptionsFragmentHost_troubleshooting_compare.png
  • studyOptionsFragmentHost_troubleshooting_systemBars_compare.png

@float3
float3 merged commit 3a0c9bc into ankiquest Oct 31, 2026
24 checks passed
@float3
float3 deleted the merge-upstream-2026-10-31 branch October 31, 2026 23:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants