Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
mcovarr committed Jul 27, 2017
1 parent 1c3bcde commit 30cc097
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 12 deletions.
3 changes: 1 addition & 2 deletions release/release_inputs.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"release_cromwell.githubToken": "<<GithubAPIToken>>",
"release_cromwell.organization": "broadinstitute",
"release_cromwell.do_release.dryRun": false
"release_cromwell.organization": "broadinstitute"
}
16 changes: 6 additions & 10 deletions release/release_workflow.wdl
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ task do_release {
# Commands that will update previously released/published dependencies in this repo
Array[String] dependencyCommands = []

# When true, nothing will be pushed to github, allows for some level of testing
Boolean dryRun = false

# Can be swapped out to try this on a fork
String organization

Expand All @@ -28,8 +25,7 @@ task do_release {
git pull --rebase

# Expect the version number on develop to be the version TO BE RELEASED
echo "Releasing ${organization}/${repo} ${releaseV}${true=" - This a dry run, push commands won't be executed" false = "" dryRun}"


echo "Updating dependencies"
${sep='\n' dependencyCommands}

Expand All @@ -56,7 +52,7 @@ task do_release {
git add latest

git diff-index --quiet HEAD || git commit -m "Update Scaladoc"
git push ${true="--dry-run" false="" dryRun} origin gh-pages
git push origin gh-pages

# Update badges on README
git checkout develop
Expand All @@ -67,7 +63,7 @@ task do_release {
git add version.png

git diff-index --quiet HEAD || git commit -m "Update README badges"
git push ${true="--dry-run" false="" dryRun} origin develop
git push origin develop
fi

# Merge develop into master
Expand All @@ -83,8 +79,8 @@ task do_release {
git tag ${releaseV}

# Push master and push the tags
git push ${true="--dry-run" false="" dryRun} origin master
git push ${true="--dry-run" false="" dryRun} --tags
git push origin master
git push --tags

# Create and push the hotfix branch
git checkout -b ${releaseV}_hotfix
Expand All @@ -109,7 +105,7 @@ task do_release {
${updateVersionCommand}
git add .
git diff-index --quiet HEAD || git commit -m "Update ${repo} version from ${releaseV} to ${nextV}"
git push ${true="--dry-run" false="" dryRun} origin develop
git push origin develop

pwd > executionDir.txt
}
Expand Down

0 comments on commit 30cc097

Please sign in to comment.