Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
cbefaf5d
Commit
cbefaf5d
authored
Mar 27, 2015
by
Eric Paris
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
output current_branch name instead of HEAD in help messages
parent
2b941f49
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
mark-new-version.sh
build/mark-new-version.sh
+4
-4
No files found.
build/mark-new-version.sh
View file @
cbefaf5d
...
@@ -45,10 +45,10 @@ if ! git diff-files --quiet pkg/version/base.go; then
...
@@ -45,10 +45,10 @@ if ! git diff-files --quiet pkg/version/base.go; then
fi
fi
release_branch
=
"release-
${
VERSION_MAJOR
}
.
${
VERSION_MINOR
}
"
release_branch
=
"release-
${
VERSION_MAJOR
}
.
${
VERSION_MINOR
}
"
current_branch
=
$(
git rev-parse
--abbrev-ref
HEAD
)
if
[[
"
${
VERSION_PATCH
}
"
!=
"0"
]]
;
then
if
[[
"
${
VERSION_PATCH
}
"
!=
"0"
]]
;
then
branch
=
$(
git rev-parse
--abbrev-ref
HEAD
)
if
[[
${
current_branch
}
!=
"
${
release_branch
}
"
]]
;
then
if
[[
${
branch
}
!=
"
${
release_branch
}
"
]]
;
then
echo
"!!! You are trying to tag to an existing minor release but are not on the release branch:
${
release_branch
}
"
echo
"!!! You are trying to tag to an existing minor release but are not on the release branch:
${
release_branch
}
"
exit
1
exit
1
fi
fi
...
@@ -98,11 +98,11 @@ echo ""
...
@@ -98,11 +98,11 @@ echo ""
echo
"- Push the tag:"
echo
"- Push the tag:"
echo
" git push git@github.com:GoogleCloudPlatform/kubernetes.git v
${
VERSION_MAJOR
}
.
${
VERSION_MINOR
}
.
${
VERSION_PATCH
}
"
echo
" git push git@github.com:GoogleCloudPlatform/kubernetes.git v
${
VERSION_MAJOR
}
.
${
VERSION_MINOR
}
.
${
VERSION_PATCH
}
"
if
[[
"
${
VERSION_PATCH
}
"
==
"0"
]]
;
then
if
[[
"
${
VERSION_PATCH
}
"
==
"0"
]]
;
then
echo
"- Submit
HEAD
as a PR to master"
echo
"- Submit
branch:
${
current_branch
}
as a PR to master"
echo
"- Merge that PR"
echo
"- Merge that PR"
echo
"- Push the new release branch"
echo
"- Push the new release branch"
echo
" git push git@github.com:GoogleCloudPlatform/kubernetes.git
${
release_branch
}
"
echo
" git push git@github.com:GoogleCloudPlatform/kubernetes.git
${
release_branch
}
"
else
else
echo
"- Submit
HEAD
as a PR to
${
release_branch
}
"
echo
"- Submit
branch:
${
current_branch
}
as a PR to
${
release_branch
}
"
echo
"- Merge that PR"
echo
"- Merge that PR"
fi
fi
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment