From fdc4e5333aede599cdef0afc6f8571e9035838c9 Mon Sep 17 00:00:00 2001 From: Max Weiss Date: Thu, 29 Apr 2021 15:42:11 -0700 Subject: [PATCH] Revert changes, disable tag push, and test if works --- buildbot/buildbot_steps.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/buildbot/buildbot_steps.sh b/buildbot/buildbot_steps.sh index 45783e0..32f52d2 100755 --- a/buildbot/buildbot_steps.sh +++ b/buildbot/buildbot_steps.sh @@ -81,8 +81,8 @@ function make_ipxe_lkrn() { curr="$(pwd)" cd "${ipxe_src_dir}/src/" || return 1 - #make bin/ipxe.lkrn EMBED="${embed_file}" CERT="${signing_cert},${ca_cert}" TRUST="${ca_cert}" || return 2 - echo lkrn > bin/ipxe.lkrn + make bin/ipxe.lkrn EMBED="${embed_file}" CERT="${signing_cert},${ca_cert}" TRUST="${ca_cert}" || return 2 + cd "$curr" return 0 } @@ -117,8 +117,8 @@ function make_ipxe_iso() { curr="$(pwd)" cd "${ipxe_src_dir}/src/" || return 1 - #make bin/ipxe.iso EMBED="${embed_file}" CERT="${signing_cert},${ca_cert}" TRUST="${ca_cert}" || return 2 - echo iso > bin/ipxe.iso + make bin/ipxe.iso EMBED="${embed_file}" CERT="${signing_cert},${ca_cert}" TRUST="${ca_cert}" || return 2 + cd "$curr" return 0 } @@ -181,7 +181,7 @@ function tag_head_and_push() { fi git tag -a "g_$(git rev-parse HEAD)" HEAD -m "BuildBot: tag commit for release $(git rev-parse HEAD)" || return 2 - git push --tags origin master + #git push --tags origin master if [ $? -ne 0 ]; then >&2 echo 'Error during attempted git push of new tag' return 3