Skip to content

Commit

Permalink
Update prepare-for-release.ps1
Browse files Browse the repository at this point in the history
  • Loading branch information
NielsPilgaard committed Jul 14, 2022
1 parent df7b4cf commit 8992778
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions automation/prepare-for-release.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,15 @@ function Close-FixedIssues {

}
function Merge-DevelopIntoMaster {
Write-Host "Merging Develop into Master, and then Master into Develop"
Write-Host "Please Develop into Master, and then Master into Develop"
Write-Host "Make sure you have no unsaved changes!" -ForegroundColor Red
Write-Host "Ctrl+C to exit"
pause
git checkout master
git merge develop
git push
git checkout develop
git merge master
}

Validate-SecretsFile
Close-FixedIssues
Merge-DevelopIntoMaster
github_changelog_generator --since-tag $LAST_MODPACK_VERSION
Write-Host
Write-Host "Upload modpack? Press CTRL-C to cancel" -ForegroundColor Green
pause
Expand Down

0 comments on commit 8992778

Please sign in to comment.