dubeejw closed pull request #207: Use regular old gogradle
URL: https://github.com/apache/incubator-openwhisk-cli/pull/207
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/.travis.yml b/.travis.yml
index af2f0bd0..c4563b90 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,6 @@ env:
- build_file_name=wsk
- zip_file_name=OpenWhisk_CLI
-
git:
depth: 3
@@ -26,8 +25,6 @@ before_install:
install:
- cd $TRAVIS_BUILD_DIR/..
- pip install --upgrade pip setuptools
- - git clone https://github.com/jonpspri/gogradle.git
- - cd gogradle && ./gradlew --console=plain assemble
before_script:
- cd $TRAVIS_BUILD_DIR/..
@@ -41,7 +38,7 @@ script:
- ./tools/travis/test_openwhisk.sh
after_success:
- - DEPLOY_BUILD_READY=true
+ - export DEPLOY_BUILD_READY=true
# This tag is automatically generated for the latest merged commit in master
branch.
- if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_EVENT_TYPE" == "push" ]
&& [ "$TRAVIS_OS_NAME" == "linux" ] ; then
git config --global user.email "[email protected]";
diff --git a/build.gradle b/build.gradle
index 3a6d6eff..d94e87f9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,44 +1,7 @@
-/*
- Holding these lines for when gogradle 0.8.2 is released (hopefully with
- pull #194 (https://github.com/gogradle/gogradle/pull/194)
-
plugins {
- id 'com.github.blindpirate.gogradle' version '0.8.2'
-}
-*/
-
-buildscript {
- repositories {
- mavenLocal()
- jcenter()
- }
- dependencies {
- classpath "org.antlr:antlr4:4.6"
- classpath group: 'com.google.inject', name: 'guice', version: '4.1.0'
- classpath group: 'org.apache.commons', name: 'commons-lang3', version:
'3.5'
- classpath group: 'org.apache.commons', name: 'commons-collections4',
version: '4.1'
- classpath group: 'commons-codec', name: 'commons-codec', version:
'1.10'
- classpath group: 'commons-io', name: 'commons-io', version: '2.5'
- classpath 'com.google.guava:guava:20.0'
- classpath 'com.github.zafarkhaja:java-semver:0.9.0'
- classpath group: 'org.jsoup', name: 'jsoup', version: '1.7.2'
- classpath group: 'com.fasterxml.jackson.core', name:
'jackson-databind', version: '2.8.5'
- classpath group: 'com.fasterxml.jackson.core', name:
'jackson-annotations', version: '2.8.5'
- classpath group: 'com.google.code.findbugs', name: 'annotations',
version: '3.0.1'
- classpath group: 'com.fasterxml.jackson.dataformat', name:
'jackson-dataformat-yaml', version: '2.8.5'
- classpath group: 'net.lingala.zip4j', name: 'zip4j', version: '1.3.2'
- classpath group: 'org.apache.ant', name: 'ant', version: '1.10.0'
- classpath group: 'com.typesafe.sbt', name: 'sbt-interface', version:
'0.13.13'
- classpath group: 'com.fasterxml.jackson.dataformat', name:
'jackson-dataformat-xml', version: '2.6.3'
- classpath group: 'org.codehaus.woodstox', name: 'woodstox-core-asl',
version: '4.4.1'
- classpath group: 'org.jooq', name: 'joor', version: '0.9.6'
- classpath 'com.moandjiezana.toml:toml4j:0.7.2'
- classpath files('../gogradle/build/libs/gogradle-0.8.1.jar')
- }
+ id 'com.github.blindpirate.gogradle' version '0.8.1'
}
-apply plugin: 'com.github.blindpirate.gogradle'
-
golang {
packagePath = 'github.com/apache/incubator-openwhisk-cli' as String
buildTags = (rootProject.findProperty('goTags')?:'').split(',')
@@ -221,17 +184,6 @@ task compile(type: Copy, dependsOn: goBuild) {
from("./build/${rootProject.localPlatform.goOs}-${rootProject.localPlatform.goArch}")
}
-/*
- Set up the goTest task to print useful information to Stdout:
- */
-goTest.generateTestReport = { testClassResults ->
- testClassResults*.results.flatten()*.failures.flatten().each() { failure ->
- logger.quiet( '-' * 40 )
- logger.quiet(failure.message)
- logger.quiet( '-' * 40 )
- }
-}
-
/*
For each platform, create an individual archive in a platform appropriate
format (tarball for Linux, zipfile for Mac & Windows).
diff --git a/tools/travis/test_openwhisk.sh b/tools/travis/test_openwhisk.sh
index 2370521b..67b1ceca 100755
--- a/tools/travis/test_openwhisk.sh
+++ b/tools/travis/test_openwhisk.sh
@@ -49,7 +49,7 @@ export OPENWHISK_HOME
#
# Run Unit and native tests
#
-./gradlew --console=plain goTest -PgoTags=unit,native
+./gradlew --console=plain --info goTest -PgoTags=unit,native
#
# Set up the OpenWhisk environment for integration testing
@@ -87,4 +87,4 @@ sleep 30
#
# Finally, run the integration test for the CLI
#
-./gradlew --console=plain goTest -PgoTags=integration
+./gradlew --console=plain --info goTest -PgoTags=integration
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
