Skip to content

Commit

Permalink
Fix .travis.yml and appveyor.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
ppalaga committed Feb 6, 2018
1 parent 8acd8b8 commit 18e2cb9
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 8 deletions.
18 changes: 17 additions & 1 deletion .travis.yml
Expand Up @@ -16,12 +16,28 @@
#

language: java

# Enable container-based infrastructure
# see http://docs.travis-ci.com/user/workers/container-based-infrastructure/
sudo: false

jdk:
- oraclejdk8

# skip the built-in ./gradlew assemle in install phase
install: true

script:
- ./gradlew clean install build
- ./gradlew clean build --info --no-daemon

after_failure:
- cat build/test-results/test/binary/results.bin

before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/

cache:
directories:
- $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/
6 changes: 5 additions & 1 deletion appveyor.yml
Expand Up @@ -18,5 +18,9 @@

environment:
JAVA_HOME: C:\Program Files\Java\jdk1.7.0

install:
- echo skip default install steps

build_script:
- gradlew.bat clean install build
- gradlew.bat clean build --info --no-daemon
9 changes: 4 additions & 5 deletions build.gradle
Expand Up @@ -26,6 +26,7 @@ plugins {

group = 'org.ec4j.gradle'
version = '0.0.1-SNAPSHOT'
ext.isReleaseVersion = !version.endsWith("-SNAPSHOT")

sourceCompatibility = 1.7

Expand All @@ -37,10 +38,7 @@ repositories {
dependencies {
compile gradleApi()
compile localGroovy()
compile 'org.antlr:antlr4-runtime:4.7'
compile 'org.ec4j.core:ec4j-core:0.0.1'
compile 'org.ec4j.maven:ec4j-lint-api:0.0.5-SNAPSHOT'
compile 'org.ec4j.maven:ec4j-linters:0.0.5-SNAPSHOT'
compile 'org.ec4j.maven:ec4j-linters:0.0.5'
testCompile 'junit:junit:4.12'
testCompile gradleTestKit()
testCompile 'org.slf4j:slf4j-api:1.7.25'
Expand Down Expand Up @@ -119,6 +117,7 @@ def licenseFileTree() {
}

signing {
required { isReleaseVersion && gradle.taskGraph.hasTask("uploadArchives") }
sign configurations.archives
}

Expand All @@ -128,7 +127,7 @@ uploadArchives {
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }

repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
authentication(userName: ossrhUsername, password: ossrhPassword)
authentication(userName: hasProperty('ossrhUsername') ? ossrhUsername: '', password: hasProperty('ossrhPassword') ? ossrhPassword: '')
}

pom.project {
Expand Down
Expand Up @@ -113,7 +113,7 @@ public void execute(ConfigurableFileTree tree) {
* @param absFile
* the {@link Path} to create a {@link Resource} for. Must be absolute.
* @param relFile
* the {@link Path} to create a {@link Resource} for. Must be relative to {@link #basedirPath}.
* the {@link Path} to create a {@link Resource} for. Must be relative to {@code project.getProjectDir()}.
* @param encoding
* the encoding of the resulting {@link Resource}
* @return a new {@link Resource} or a new {@link EditableResource}
Expand Down

0 comments on commit 18e2cb9

Please sign in to comment.