mirror of
https://github.com/YunoHost/apps.git
synced 2024-09-03 20:06:07 +02:00
appstore: wishlist PRs are meant to target the default branch
This commit is contained in:
parent
6dad9b8c1c
commit
692dcfb450
1 changed files with 5 additions and 5 deletions
10
store/app.py
10
store/app.py
|
@ -257,8 +257,8 @@ def add_to_wishlist():
|
||||||
author = InputGitAuthor(config["GITHUB_LOGIN"], config["GITHUB_EMAIL"])
|
author = InputGitAuthor(config["GITHUB_LOGIN"], config["GITHUB_EMAIL"])
|
||||||
repo = github.get_repo("Yunohost/apps")
|
repo = github.get_repo("Yunohost/apps")
|
||||||
current_wishlist_rawtoml = repo.get_contents(
|
current_wishlist_rawtoml = repo.get_contents(
|
||||||
"wishlist.toml", ref="app-store"
|
"wishlist.toml", ref=repo.default_branch)
|
||||||
) # FIXME : ref=repo.default_branch)
|
)
|
||||||
current_wishlist_sha = current_wishlist_rawtoml.sha
|
current_wishlist_sha = current_wishlist_rawtoml.sha
|
||||||
current_wishlist_rawtoml = current_wishlist_rawtoml.decoded_content.decode()
|
current_wishlist_rawtoml = current_wishlist_rawtoml.decoded_content.decode()
|
||||||
new_wishlist = toml.loads(current_wishlist_rawtoml)
|
new_wishlist = toml.loads(current_wishlist_rawtoml)
|
||||||
|
@ -289,8 +289,8 @@ def add_to_wishlist():
|
||||||
try:
|
try:
|
||||||
# Get the commit base for the new branch, and create it
|
# Get the commit base for the new branch, and create it
|
||||||
commit_sha = repo.get_branch(
|
commit_sha = repo.get_branch(
|
||||||
"app-store"
|
repo.default_branch
|
||||||
).commit.sha # FIXME app-store -> repo.default_branch
|
).commit.sha
|
||||||
repo.create_git_ref(ref=f"refs/heads/{new_branch}", sha=commit_sha)
|
repo.create_git_ref(ref=f"refs/heads/{new_branch}", sha=commit_sha)
|
||||||
except exception as e:
|
except exception as e:
|
||||||
print("... Failed to create branch ?")
|
print("... Failed to create branch ?")
|
||||||
|
@ -335,7 +335,7 @@ Proposed by **{session['user']['username']}**
|
||||||
title=message,
|
title=message,
|
||||||
body=body,
|
body=body,
|
||||||
head=new_branch,
|
head=new_branch,
|
||||||
base="app-store", # FIXME app-store -> repo.default_branch
|
base=repo.default_branch,
|
||||||
)
|
)
|
||||||
|
|
||||||
url = f"https://github.com/YunoHost/apps/pull/{pr.number}"
|
url = f"https://github.com/YunoHost/apps/pull/{pr.number}"
|
||||||
|
|
Loading…
Add table
Reference in a new issue