forked from Sysdeploy/ipxe_scripts
Revert changes, disable tag push, and test if works
This commit is contained in:
parent
9e48a70ce9
commit
fdc4e5333a
|
@ -81,8 +81,8 @@ function make_ipxe_lkrn() {
|
||||||
curr="$(pwd)"
|
curr="$(pwd)"
|
||||||
cd "${ipxe_src_dir}/src/" || return 1
|
cd "${ipxe_src_dir}/src/" || return 1
|
||||||
|
|
||||||
#make bin/ipxe.lkrn EMBED="${embed_file}" CERT="${signing_cert},${ca_cert}" TRUST="${ca_cert}" || return 2
|
make bin/ipxe.lkrn EMBED="${embed_file}" CERT="${signing_cert},${ca_cert}" TRUST="${ca_cert}" || return 2
|
||||||
echo lkrn > bin/ipxe.lkrn
|
|
||||||
cd "$curr"
|
cd "$curr"
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
@ -117,8 +117,8 @@ function make_ipxe_iso() {
|
||||||
curr="$(pwd)"
|
curr="$(pwd)"
|
||||||
cd "${ipxe_src_dir}/src/" || return 1
|
cd "${ipxe_src_dir}/src/" || return 1
|
||||||
|
|
||||||
#make bin/ipxe.iso EMBED="${embed_file}" CERT="${signing_cert},${ca_cert}" TRUST="${ca_cert}" || return 2
|
make bin/ipxe.iso EMBED="${embed_file}" CERT="${signing_cert},${ca_cert}" TRUST="${ca_cert}" || return 2
|
||||||
echo iso > bin/ipxe.iso
|
|
||||||
cd "$curr"
|
cd "$curr"
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
@ -181,7 +181,7 @@ function tag_head_and_push() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
git tag -a "g_$(git rev-parse HEAD)" HEAD -m "BuildBot: tag commit for release $(git rev-parse HEAD)" || return 2
|
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
|
if [ $? -ne 0 ]; then
|
||||||
>&2 echo 'Error during attempted git push of new tag'
|
>&2 echo 'Error during attempted git push of new tag'
|
||||||
return 3
|
return 3
|
||||||
|
|
Loading…
Reference in New Issue
Block a user