Browse Source

[TravisCI] let ppa to use the next-precise branch

Andy Li 9 năm trước cách đây
mục cha
commit
924c1c1f08
1 tập tin đã thay đổi với 1 bổ sung1 xóa
  1. 1 1
      tests/RunCi.hx

+ 1 - 1
tests/RunCi.hx

@@ -765,7 +765,7 @@ class RunCi {
 			runCommand("backportpackage -d vivid   --upload ${PPA} --yes ../haxe_*.dsc");
 			runCommand("backportpackage -d vivid   --upload ${PPA} --yes ../haxe_*.dsc");
 			runCommand("backportpackage -d trusty  --upload ${PPA} --yes ../haxe_*.dsc");
 			runCommand("backportpackage -d trusty  --upload ${PPA} --yes ../haxe_*.dsc");
 			runCommand("git checkout debian/changelog");
 			runCommand("git checkout debian/changelog");
-			runCommand("git merge -X ours --no-edit origin/backport-precise");
+			runCommand("git merge -X ours --no-edit origin/next-precise");
 			runCommand('dch -v "1:${SNAPSHOT_VERSION}-1" --urgency low "snapshot build"');
 			runCommand('dch -v "1:${SNAPSHOT_VERSION}-1" --urgency low "snapshot build"');
 			runCommand("debuild -S -sa");
 			runCommand("debuild -S -sa");
 			runCommand("backportpackage -d precise --upload ${PPA} --yes ../haxe_*.dsc");
 			runCommand("backportpackage -d precise --upload ${PPA} --yes ../haxe_*.dsc");