Merge pull request #17 from peachcloud/reset
Use more reliable method of getting latest code from origin/main during package building
This commit is contained in:
commit
854e0b62c0
|
@ -31,8 +31,8 @@ def build_peach_config(default_branch=True):
|
||||||
cwd=service_path).decode(sys.stdout.encoding)
|
cwd=service_path).decode(sys.stdout.encoding)
|
||||||
branch = default_branch.replace('origin/', '').strip()
|
branch = default_branch.replace('origin/', '').strip()
|
||||||
subprocess.check_call(["git", "checkout", branch], cwd=service_path)
|
subprocess.check_call(["git", "checkout", branch], cwd=service_path)
|
||||||
subprocess.check_call(["git", "reset", "HEAD", "--hard"], cwd=service_path)
|
subprocess.check_call(["git", "fetch", "--all"], cwd=service_path)
|
||||||
subprocess.check_call(["git", "pull"], cwd=service_path)
|
subprocess.check_call(["git", "reset", "--hard", default_branch], cwd=service_path)
|
||||||
# remove old build dir
|
# remove old build dir
|
||||||
subprocess.check_call([
|
subprocess.check_call([
|
||||||
"rm",
|
"rm",
|
||||||
|
|
|
@ -36,8 +36,8 @@ def build_rust_packages(default_branch=False):
|
||||||
cwd=service_path).decode(sys.stdout.encoding)
|
cwd=service_path).decode(sys.stdout.encoding)
|
||||||
branch = default_branch.replace('origin/', '').strip()
|
branch = default_branch.replace('origin/', '').strip()
|
||||||
subprocess.check_call(["git", "checkout", branch], cwd=service_path)
|
subprocess.check_call(["git", "checkout", branch], cwd=service_path)
|
||||||
subprocess.check_call(["git", "reset", "HEAD", "--hard"], cwd=service_path)
|
subprocess.check_call(["git", "fetch", "--all"], cwd=service_path)
|
||||||
subprocess.check_call(["git", "pull"], cwd=service_path)
|
subprocess.check_call(["git", "reset", "--hard", default_branch], cwd=service_path)
|
||||||
debian_package_path = subprocess.check_output(
|
debian_package_path = subprocess.check_output(
|
||||||
[
|
[
|
||||||
CARGO_PATH,
|
CARGO_PATH,
|
||||||
|
|
Loading…
Reference in New Issue