From f53abe6bc254680fa375da35c9a3c71d0553c31c Mon Sep 17 00:00:00 2001 From: Miguel Molina Date: Tue, 8 Aug 2017 12:32:32 +0200 Subject: [PATCH] travis configuration Signed-off-by: Miguel Molina --- .travis.yml | 21 ++++++++++++++++++++- java/Makefile | 2 ++ java/build.sbt | 21 --------------------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index 32c42be..866622c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: go +sudo: required go: - 1.8 @@ -7,6 +8,24 @@ go: matrix: allow_failures: - go: tip + include: + - language: scala + jdk: oraclejdk8 + + install: + - GIMME_OUTPUT=$(gimme 1.8 | tee -a $HOME/.bashrc) && eval "$GIMME_OUTPUT" + - export GOPATH=$HOME/gopath + - mkdir -p $GOPATH/src/gopkg.in/src-d/enry.v1 + - rsync -az ${TRAVIS_BUILD_DIR}/ $GOPATH/src/gopkg.in/src-d/enry.v1 + - go get -v gopkg.in/src-d/enry.v1/... + - sudo apt-get install maven + + before_script: + - cd java + - make + + script: + - make test install: - rm -rf $GOPATH/src/gopkg.in/src-d @@ -26,7 +45,7 @@ before_deploy: deploy: provider: releases - api_key: $GITHUB_TOKEN + api_key: $GITHUB_TOKEN file_glob: true file: build/*.tar.gz skip_cleanup: true diff --git a/java/Makefile b/java/Makefile index 1c776ef..ceb89c3 100644 --- a/java/Makefile +++ b/java/Makefile @@ -7,6 +7,8 @@ RESOURCES_SRC=../.shared RESOURCES_DIR=./shared HEADER_FILE=$(RESOURCES_DIR)/libenry.h +SHELL := /bin/bash + all: $(JAR) $(JAR): $(RESOURCES_DIR) $(JNAERATOR_JAR) diff --git a/java/build.sbt b/java/build.sbt index 08b41fb..59f91ed 100644 --- a/java/build.sbt +++ b/java/build.sbt @@ -15,24 +15,3 @@ unmanagedClasspath in Runtime += baseDirectory.value / "shared" unmanagedClasspath in Compile += baseDirectory.value / "shared" testOptions += Tests.Argument(TestFrameworks.JUnit) -lazy val buildNative = taskKey[Unit]("builds native code") - -buildNative := { - val res = "make"!; - if (res != 0) throw new RuntimeException("unable to generate shared libraries and native jar bindings") -} - -test := { - buildNative.value - (test in Test).value -} - -compile := { - buildNative.value - (compile in Compile).value -} - -assembly := { - buildNative.value - assembly.value -}