From e127c998ba38c46a37b3c8baff6091b27bd8f1e5 Mon Sep 17 00:00:00 2001 From: Rob Swindell <rob@synchro.net> Date: Sun, 6 Sep 2020 18:41:13 -0700 Subject: [PATCH] Daily-builds are now a branch, not a tag, as is the way of Git --- exec/testbuild.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/exec/testbuild.js b/exec/testbuild.js index 58f5df70de..e8e3913cfe 100755 --- a/exec/testbuild.js +++ b/exec/testbuild.js @@ -220,9 +220,9 @@ send_email(system.platform + " builds successful in " + elapsed_time(time() - st chdir(temp_dir); -var comment = "Successful build on " + system_description; -system.exec("git tag -m \"" + comment + "\" -a goodbuild_" + platform + "_" + date_str); -system.exec("git push --tags"); +system.exec("git checkout -b dailybuild_" + platform); +system.exec("git merge master"); +system.exec("git push --set-upstream origin dailybuild_" + platform); var dest = file_area.dir["sbbs"].path+archive; log(LOG_INFO,format("Copying %s to %s",archive,dest)); -- GitLab