This repository was archived by the owner on Mar 5, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 394
Add tagging of remote repo. #903
Merged
Merged
Changes from 1 commit
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,6 +18,10 @@ | |
promptText="Enter a deploy branch (defaults to [current branch]-build)" | ||
promptCharacter=":" | ||
defaultValue="${branch.current}-build"/> | ||
<propertyprompt propertyName="deploy.tag" useExistingValue="true" | ||
promptText="Enter the name of the tag to create" | ||
promptCharacter=":" | ||
defaultValue=""/> | ||
|
||
<!-- Check necessary runtime parameters. --> | ||
<if> | ||
|
@@ -47,13 +51,22 @@ | |
<!--Commit artifact. --> | ||
<phingcall target="deploy:commit"/> | ||
|
||
<!-- Commit tag if present --> | ||
<if> | ||
<isset property="deploy.tag"/> | ||
<then> | ||
<phingcall target="deploy:tag"/> | ||
</then> | ||
</if> | ||
|
||
<!-- Push up changes to remotes if this is not a dry run.--> | ||
<if> | ||
<not><isset property="deploy.dryRun"/></not> | ||
<then> | ||
<phingcall target="deploy:push-all"/> | ||
</then> | ||
</if> | ||
|
||
</target> | ||
|
||
<target name="deploy:remote:add" description="Adds a git remote and checks out deploy branch from upstream." hidden="true"> | ||
|
@@ -157,6 +170,16 @@ | |
<exec command="echo ${deploy.remote} | openssl md5 | cut -d' ' -f 2" outputProperty="remoteName"/> | ||
<exec command="git push ${remoteName} ${deploy.branch}" dir="${deploy.dir}" outputProperty="deploy.push.output" logoutput="true" checkreturn="true" level="${blt.exec_level}"/> | ||
<exec command="export DEPLOY_UPTODATE=$(echo '${deploy.push.output}' | grep --quiet 'Everything up-to-date')" logoutput="true" checkreturn="true" level="${blt.exec_level}" passthru="true"/> | ||
|
||
<!-- Push tag if present --> | ||
<if> | ||
<isset property="deploy.tag"/> | ||
<then> | ||
<exec command="echo ${deploy.remote} | openssl md5 | cut -d' ' -f 2" outputProperty="remoteName"/> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. remoteName should already be set here, so I think this line can be removed. |
||
<exec command="git push ${remoteName} ${deploy.tag}-build" dir="${deploy.dir}" outputProperty="deploy.push.output" logoutput="true" checkreturn="true" level="${blt.exec_level}"/> | ||
<exec command="export DEPLOY_UPTODATE=$(echo '${deploy.push.output}' | grep --quiet 'Everything up-to-date')" logoutput="true" checkreturn="true" level="${blt.exec_level}" passthru="true"/> | ||
</then> | ||
</if> | ||
</target> | ||
|
||
<target name="deploy:sanitize" description="Removes sensitive files from the deploy docroot." hidden="true"> | ||
|
@@ -179,4 +202,9 @@ | |
<property name="cm.core.config-dir" value="vcs"/> | ||
</phingcall> | ||
</target> | ||
|
||
<target name="deploy:tag" description="Tag repository."> | ||
<!-- Add -build to tag. --> | ||
<exec command="git tag -a ${deploy.tag}-build -m '${deploy.commitMsg}'" dir="${deploy.dir}" logoutput="true" level="${blt.exec_level}" passthru="true"/> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This tags the "build" repo, but not the source repo, right? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. correct There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Don't we want to also tag the source repo? @geerlingguy |
||
</target> | ||
</project> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we need to split this into two prompts:
Otherwise, this will always create a tag.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
refactoring now.