Skip to content
Snippets Groups Projects
Commit 752bd101 authored by Natanael Copa's avatar Natanael Copa
Browse files

scripts/mkimage-yaml: fix branch

we need get the branch from tag instead of git branch, because we
generate releasecandidates and the first stable release from git master
and only do the git branch after the release is done.
parent f147132d
No related branches found
No related tags found
No related merge requests found
...@@ -23,14 +23,20 @@ done ...@@ -23,14 +23,20 @@ done
set -- $opt "$@" set -- $opt "$@"
releasedir="$branch/releases/$arch"
if [ -z "$branch" ]; then if [ -z "$branch" ]; then
git_branch="$(git rev-parse --abbrev-ref HEAD)" case "$release" in
case "$git_branch" in *.*.*_alpha*|*.*.*_beta*) branch=edge;;
*-stable) branch=${git_branch%-stable};; *.*.*) branch=${release%.*}; branch="v${branch#v}";;
*) branch=edge;; *)
git_branch="$(git rev-parse --abbrev-ref HEAD)"
case "$git_branch" in
*-stable) branch=${git_branch%-stable};;
*) branch=edge;;
esac
;;
esac esac
fi fi
releasedir="$branch/releases/$arch"
[ -n "$arch" ] || arch=$(apk --print-arch) [ -n "$arch" ] || arch=$(apk --print-arch)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment