Skip to content

Commit

Permalink
tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
deanhiller committed Jul 22, 2018
1 parent 779758d commit c37cd65
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
16 changes: 10 additions & 6 deletions release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,16 @@ else
exit $test_result
fi

echo "##################################"
echo "next copy over legacy project to upgrade it(auto-upgrade)"
echo "##################################"

cp -r webserver/output/webpiecesexample-all/* ../webpiecesexample-all

echo "##################################"
echo "next release to maven repositories"
echo "##################################"

#MUST turn parallel builds off for release or it fails!!!
#We skip tests since those are done in runAllTesting.sh AND that script ALSO test legacy compatibility and building a fake project from the new release AND starting the server
./gradlew --stacktrace -Dorg.gradle.parallel=false -Dorg.gradle.configureondemand=false -PprojVersion=$@ clean release -x test
Expand All @@ -38,12 +48,6 @@ fi

git tag v1.9.$@

echo "##################################"
echo "DONE tagging, next copy over legacy project to upgrade it(auto-upgrade)"
echo "##################################"

cp -r webserver/output/webpiecesexample-all/* ../webpiecesexample-all

end=`date +%s`
runtime=$((end-start))
echo "###################################"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,12 @@ protected String getFilePath(GroovyTemplateSuperclass callingTemplate, Map<Objec
return path;
}

/**
/*
* This is a bit nasty circular dependency but this tag is special and whether in dev or prod mode needs
* to re-use all the loadTemplate/runTemplate logic
*
* TEmplateService -> HtmlTagLookup -> HtmlFileTag -> TemplateService
*
* @param svc
*/
public void initialize(TemplateService svc) {
this.svc = svc;
Expand Down

0 comments on commit c37cd65

Please sign in to comment.