You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/31 19:25:46 UTC
[isis] 01/09: ISIS-2094: fixes to the verify-isis-release.sh script
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 9b3a9b671fe184cbc921cdf293768336294f8e97
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 31 15:43:04 2020 +0000
ISIS-2094: fixes to the verify-isis-release.sh script
... still need to test it, mind
---
scripts/verify-isis-release.sh | 89 +++++++++++++++++++++---------------------
1 file changed, 45 insertions(+), 44 deletions(-)
diff --git a/scripts/verify-isis-release.sh b/scripts/verify-isis-release.sh
index 4f4c7f7..671c36f 100755
--- a/scripts/verify-isis-release.sh
+++ b/scripts/verify-isis-release.sh
@@ -8,13 +8,15 @@
#
#
# prereqs:
-# curl or wget
+# curl
# gpg
# unzip
-# jdk 7
-# mvn 3.5.0+
+# jdk 8
+# mvn 3.6.0+
#
+# shellcheck disable=SC2164
+
_execmustpass(){
echo $@
$@
@@ -63,7 +65,10 @@ _unpack(){
_build(){
echo 'Removing Isis from local repo '$module
rm -rf ~/.m2/repository/org/apache/isis
- for module in ./isis*/ ./*archetype*/
+
+ echo 'Building'
+ # previously there were multiple directories, now just the one.
+ for module in ./isis*/
do
pushd $module
_execmustpass mvn clean install -Dskip.git
@@ -71,40 +76,36 @@ _build(){
done
}
-_generate_simpleapp(){
- ISISCPN=simpleapp
- rm -rf test-$ISISCPN
- mkdir test-$ISISCPN
- pushd test-$ISISCPN
-
- _execmustpass mvn archetype:generate \
- -D archetypeCatalog=local \
- -D groupId=com.mycompany \
- -D artifactId=myapp \
- -D archetypeGroupId=org.apache.isis.archetype \
- -D archetypeArtifactId=$ISISCPN-archetype \
- -B
-
- pushd myapp
+_download_simpleapp(){
+ APP=simpleapp
+ BRANCH=master
+
+ rm -rf test-$APP
+ mkdir test-$APP
+ pushd test-$APP
+
+ REPO=isis-app-$APP
+ curl "https://codeload.github.com/apache/$REPO/zip/$BRANCH" | jar xv
+ mv $REPO-$BRANCH $REPO
+
+ pushd $REPO
_execmustpass mvn clean install
popd; popd
}
-_generate_helloworld(){
- ISISCPN=helloworld
- rm -rf test-$ISISCPN
- mkdir test-$ISISCPN
- pushd test-$ISISCPN
-
- _execmustpass mvn archetype:generate \
- -D archetypeCatalog=local \
- -D groupId=com.mycompany \
- -D artifactId=myapp \
- -D archetypeGroupId=org.apache.isis.archetype \
- -D archetypeArtifactId=$ISISCPN-archetype \
- -B
-
- pushd myapp
+_download_helloworld(){
+ APP=helloworld
+ BRANCH=master
+
+ rm -rf test-$APP
+ mkdir test-$APP
+ pushd test-$APP
+
+ REPO=isis-app-$APP
+ curl "https://codeload.github.com/apache/$REPO/zip/$BRANCH" | jar xv
+ mv $REPO-$BRANCH $REPO
+
+ pushd $REPO
_execmustpass mvn clean install
popd; popd
}
@@ -139,8 +140,6 @@ fi
cat <<EOF >/tmp/url.txt
http://repository.apache.org/content/repositories/orgapacheisis-$NEXUSREPONUM/org/apache/isis/core/isis/$VERSION/isis-$VERSION-source-release.zip
-http://repository.apache.org/content/repositories/orgapacheisis-$NEXUSREPONUM/org/apache/isis/archetype/helloworld-archetype/$VERSION/helloworld-archetype-$VERSION-source-release.zip
-http://repository.apache.org/content/repositories/orgapacheisis-$NEXUSREPONUM/org/apache/isis/archetype/simpleapp-archetype/$VERSION/simpleapp-archetype-$VERSION-source-release.zip
EOF
# The work starts here
@@ -148,21 +147,23 @@ _download
_verify
_unpack
_build
-_generate_simpleapp
-_generate_helloworld
+_download_simpleapp
+_download_helloworld
# print instructions for final testing
clear
cat <<EOF
-# Test out simpleapp using:
-pushd test-simpleapp/myapp
-mvn -pl webapp jetty:run
+# Test out helloworld using:
+pushd test-helloworld/isis-app-helloworld
+mvn clean install
+mvn spring-boot:run
popd
-# Test out helloworld using:
-pushd test-helloworld/myapp
-mvn jetty:run
+# Test out simpleapp using:
+pushd test-simpleapp/isis-app-simpleapp
+mvn clean install
+mvn -pl webapp spring-boot:run
popd
EOF
\ No newline at end of file