Skip to content

Commit

Permalink
Update makerelease.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
jpanther committed Mar 7, 2019
1 parent 7b4ec61 commit 58d3852
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions makerelease.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ modver=`cat info.json|jq -r .version`
gitbranch=`git rev-parse --abbrev-ref HEAD`

# Switch to master branch
git checkout master
#git checkout master

# Merge changes from develop branch
git merge --no-ff develop
#git merge --no-ff 0.16

# Create git tag for this version
git tag "v$modver"

# Prepare zip for Factorio native use and mod portal
git archive --prefix "${modname}_$modver/" -o "../release/${modname}_$modver.zip" HEAD
git archive --prefix "${modname}_$modver/" -o "/Users/james/Desktop/tmp/${modname}_$modver.zip" HEAD

# Push tag to git
git push origin "v$modver"

# Switch back to original branch
git checkout $gitbranch
#git checkout $gitbranch

0 comments on commit 58d3852

Please sign in to comment.