Skip to content

Open the sync pull request straight from ankidroid:main - #54

Merged
float3 merged 1 commit into
ankiquestfrom
fix/sync-without-main
Sep 29, 2026
Merged

float3 merged 1 commit into
ankiquestfrom
fix/sync-without-main

Conversation

@float3

@float3 float3 commented Sep 29, 2026 •

Copy link
Copy Markdown
Owner
  • the fork keeps no main branch any more (deleted; the "Keep main" ruleset is removed)
  • the job checks out ankiquest, fetches ankidroid/Anki-Android main, and if ankiquest is behind opens a PR with head ankidroid:main (skips if one is open)
  • REST API instead of gh pr create: its --head owner:branch does not support organizations
  • nothing is pushed any more, so UPSTREAM_SYNC_TOKEN only needs pull request access; still a PAT so the PR's CI runs
  • conflicts: merge upstream into a branch from ankiquest and merge that; the upstream PR then shows as merged

Deleting main after merging a sync PR (GitHub offers it) made every later run fail at checkout, so no sync PR opened after Sep 27. The job now checks out the default branch, recreates main from upstream when it is missing, and still refuses to overwrite a main with commits upstream lacks. The PR text asks to keep main.
@float3
float3 merged commit bbe701a into ankiquest Sep 29, 2026
16 checks passed
@github-actions

Copy link
Copy Markdown

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

  • AnkiquestHomeScreenshotTest: 1 change
  • DeckPickerScreenshotTest: 3 changes
  • NavigationDrawerScreenshotTest: 1 change
  • ReviewRemindersScreenshotTest: 5 changes
All 10 changed screenshots

AnkiquestHomeScreenshotTest

  • today_320dp_compare.png

DeckPickerScreenshotTest

  • deck_list_after_dismissing_create_deck_dialog_compare.png
  • hierarchy_lines_collapsed_compare.png
  • keyboard_open_scrolled_to_bottom_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 changed the title Sync upstream even when main was deleted Open the sync pull request straight from ankidroid:main Sep 29, 2026
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.

1 participant