mo2/modorganizer-umbrella
0
0
Fork 0
mirror of https://github.com/ModOrganizer2/modorganizer-umbrella.git synced 2026-07-27 13:58:32 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for GH implementation

Browse Source
This commit is contained in:
Jeremy Rimpo
2020-09-21 09:11:39 -05:00
parent 11be255641
commit f4f79516e3
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
makefile.uni.py
+2 -1
View File
@@ -151,7 +151,8 @@ for author, git_path, path, branch, dependencies, Build in [
gh_pr_branch = None
if os.getenv('APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH') is not None:
gh_pr_branch = '{}:{}'.format(os.getenv('APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME'), os.getenv('APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH'))
pr_name = os.getenv('APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME', '').split('/')[0]
gh_pr_branch = '{}:{}'.format(pr_name, os.getenv('APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH'))
if git_path != "cmake_common":
appveyor_cmake_step.depend("cmake_common")
unibuild/modules/git.py
+3 -2
View File
@@ -154,8 +154,9 @@ class Clone(Repository):
if self.__gh_pr is not None:
proc = Popen([config['paths']['gh'], "pr", "checkout", self.__gh_pr],
cwd=self.__super_repository.path,
env=config['__environment'])
cwd=self._context["build_path"],
env=config['__environment'],
stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.PIPE)
proc.communicate()
elif self.__commit is not None:
if self.__shallowclone: