mirror of
https://github.com/Abdess/retroarch_system.git
synced 2026-11-13 21:43:55 -06:00
fix: compare --changed with the project main line
In a fork's clone origin/main is the fork: once pushed it is HEAD, and profile_sync --changed --strict checked nothing and passed while the PR's CI then failed. The default base is now the line validate_pr.py reads: upstream/main or origin/main when that remote is the project, the project's main fetched otherwise.
This commit is contained in:
1 parent
cb4649bb23
commit
bef8b50669
3 files changed
+46
-6
No files matched your search
@@ -5896,6 +5896,24 @@ class TestBranchProfiles(unittest.TestCase):
|
||||
["draft", "edited", "new"],
|
||||
)
|
||||
|
||||
def test_a_fork_clone_compares_with_the_project(self):
|
||||
"""origin is the fork, pushed: origin/main is HEAD, and the default
|
||||
base found nothing to check while the PR's CI failed."""
|
||||
base = subprocess.run(
|
||||
["git", "rev-parse", "main"], cwd=self.root, capture_output=True,
|
||||
text=True, check=True,
|
||||
).stdout.strip()
|
||||
self._git("remote", "add", "origin", "https://github.com/someone/retrobios")
|
||||
self._git("remote", "add", "upstream", "https://github.com/Abdess/retrobios")
|
||||
self._git("update-ref", "refs/remotes/origin/main", "HEAD")
|
||||
self._git("update-ref", "refs/remotes/upstream/main", base)
|
||||
args = profile_sync.build_parser().parse_args(["--changed"])
|
||||
profiles = {"kept": {}, "edited": {}, "new": {}, "draft": {}}
|
||||
self.assertEqual(
|
||||
list(profile_sync.select_profiles(profiles, args)),
|
||||
["draft", "edited", "new"],
|
||||
)
|
||||
|
||||
|
||||
class TestBranchCheckIsWired(unittest.TestCase):
|
||||
"""CONTRIBUTING and CI name the branch's profiles through the flag."""
|
||||
|
||||
Reference in new issue
Block a user