release: Get rid of "master"

We don't use the "master" branch for anything in
`kata-containers/kata-containers`.

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
This commit is contained in:
Fabiano Fidêncio 2021-04-06 10:06:07 +00:00
parent c2197cbf2b
commit ca4dccf980
3 changed files with 5 additions and 5 deletions

View File

@ -9,7 +9,7 @@ MK_DIR :=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
.PHONY: bump-kata-version .PHONY: bump-kata-version
NEW_VERSION := NEW_VERSION :=
TARGET_BRANCH ?= "master" TARGET_BRANCH ?= "main"
# Run update-repository-version.sh # Run update-repository-version.sh
# $1 : repository to bump # $1 : repository to bump

View File

@ -15,7 +15,7 @@ script_name="$(basename "${BASH_SOURCE[0]}")"
OWNER=${OWNER:-"kata-containers"} OWNER=${OWNER:-"kata-containers"}
PROJECT="Kata Containers" PROJECT="Kata Containers"
PUSH="${PUSH:-"false"}" PUSH="${PUSH:-"false"}"
branch="master" branch="main"
readonly URL_RAW_FILE="https://raw.githubusercontent.com/${OWNER}" readonly URL_RAW_FILE="https://raw.githubusercontent.com/${OWNER}"
#The runtime version is used as reference of latest release #The runtime version is used as reference of latest release
# This is set to the right value later. # This is set to the right value later.
@ -134,9 +134,9 @@ tag_repos() {
do_tag "${tag}" do_tag "${tag}"
if [ "${branch}" == "master" ]; then if [ "${branch}" == "main" ]; then
if echo "${tag}" | grep -oP '.*-rc0$'; then if echo "${tag}" | grep -oP '.*-rc0$'; then
info "This is a rc0 for master - creating stable branch" info "This is a rc0 for main - creating stable branch"
stable_branch=$(echo ${tag} | awk 'BEGIN{FS=OFS="."}{print $1 "." $2}') stable_branch=$(echo ${tag} | awk 'BEGIN{FS=OFS="."}{print $1 "." $2}')
stable_branch="stable-${stable_branch}" stable_branch="stable-${stable_branch}"
info "creating branch ${stable_branch} for ${repo}" info "creating branch ${stable_branch} for ${repo}"

View File

@ -49,6 +49,6 @@ OK
echo "Local update version update should work" echo "Local update version update should work"
new_version="50.0.0-rc0" new_version="50.0.0-rc0"
out=$("${script_dir}/update-repository-version.sh" "${new_version}" "master" 2>&1) out=$("${script_dir}/update-repository-version.sh" "${new_version}" "main" 2>&1)
output_should_contain "${out}" "release: Kata Containers ${new_version}" output_should_contain "${out}" "release: Kata Containers ${new_version}"
OK OK