diff --git a/makerelease.sh b/makerelease.sh index 160d2f5..28e27be 100755 --- a/makerelease.sh +++ b/makerelease.sh @@ -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