Repository navigation
Keep fork CI in ankiquest_* workflows, restore upstream .github - #88
Merged
Merged
Conversation
Restore every upstream .github file to ankidroid/Anki-Android main so upstream merges stop conflicting there. The fork's lint, unit test, emulator test and screenshot changes now live in ankiquest_* copies, the fork-only nix, upstream sync and workflow test workflows get the same prefix, and a weekly flake.lock pull request replaces the Dependabot nix entry.
|
Snapshot diff report vs
All 5 changed screenshotsAllActivitiesScreenshotTest
AnkiquestHomeScreenshotTest
PreferencesScreenshotTest
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Every upstream file under
.github/is now byte-identical toankidroid/Anki-Androidmain(git diff origin/main -- .githubonly lists addedankiquest_*files,.github/testsandankiquest-release.md), so upstream merges should no longer conflict there (like #82 did ontests_unit.yml).What moved where:
lint.yml,tests_unit.yml,tests_emulator.yml→ankiquest_lint.yml,ankiquest_tests_unit.yml,ankiquest_tests_emulator.yml. These keep the fork changes: push runs only onankiquest(one run per PR push, from Run lint, emulator and nix checks once per PR push #85), Gradle cache writes onankiquest,macos-latestand the 75-minute JUnit timeout. Job names don't change, so the checks still show up asLint Kotlin,Lint Javascript,JUnit Tests (ubuntu|macos|windows run 1)andAndroid Emulator Test (...).ankiquesthas no branch protection, so no required-check settings are affected.screenshot_store.yml,screenshot_compare.yml,screenshot_comment.yml→ankiquest_screenshot_*.yml. These keep the per-branchankiquestbaseline and fail when no baseline exists. Compare downloads fromankiquest_screenshot_store.yml, and Comment triggers onankiquest Screenshots: Compare. The first compare on a PR after merge needs a baseline: rungh workflow run ankiquest_screenshot_store.yml -R float3/AnkiQuest-Android --ref ankiquestafter merging, or wait for the first push toankiquest.milestone.yml,assignees.yml: no fork copy. The fork has no milestones, and on a single-owner repo there are no assignees worth clearing, so these bots aren't needed. Their regression tests were removed. The screenshot tests now point at theankiquest_copies.nix.yml,sync_upstream.yml,milestone_tests.yml→ankiquest_nix.yml,ankiquest_sync_upstream.yml,ankiquest_workflow_tests.yml(renamed, so the prefix covers every fork-only workflow; job names unchanged).dependabot.ymlis restored to upstream. Dependabot only reads this one file from the default branch, so there are two choices: keep a fork edit that conflicts whenever upstream touches it, or give up fork-side Dependabot. Fork-side Gradle, npm and Actions bumps would also edit the samelibs.versions.tomlanduses:lines that upstream's own Dependabot bumps, which conflicts on every sync. Upstream's bumps already reach the fork through the daily sync PR. Upstream's config targetsdependency-updates, which doesn't exist here, so on the fork Dependabot will report a missing target branch and open nothing. The Nix ecosystem entry moves toankiquest_flake_lock.yml: weekly or on dispatch, it runsnix flake updateand opens aflake-lock-<date>PR intoankiquestwithUPSTREAM_SYNC_TOKEN, so the PR gets normal CI, including the dev-shell build.Workflows to disable
After this merges, the upstream copies would run alongside the
ankiquest_ones (duplicate checks, and pushes to every PR branch) or do things the fork doesn't want:These use file names because some display names are shared or contain emoji. Upstream
milestone.ymlfails on this repo (milestone 79 doesn't exist). Upstreamassignees.ymllooks up linked issues ofankidroid/Anki-AndroidPRs with the same number and clears assignees on fork issues with those numbers. Both should be disabled soon after merging. A disabled workflow stays disabled when upstream edits its file. Workflow files that upstream adds later start enabled.Left enabled because they are harmless or useful here: CodeQL, Conflict Scan, Add/Remove Labels, Merge Requirements, Cancel Obsolete Merge Queue Runs, and the dispatch-only APK Size Comparison, OpenCollective, Publish and Sync Translations workflows. Publish's scheduled job is guarded to
ankidroid/Anki-Android. Stale is already disabled.