Skip to content

Commit

Permalink
Updates build and CI artefacts after removing Java libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
VincenzoFerme committed Nov 20, 2016
1 parent 2963dc7 commit d158804
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 82 deletions.
52 changes: 17 additions & 35 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,69 +1,51 @@
sudo: required
dist: precise
dist: trusty
group: edge

sudo: required

language: java
jdk:
- oraclejdk8
language: go
go:
- 1.5.2
env:
- GOARCH=amd64
gobuild_args:

# whitelist
branches:
only:
- fix-hash-generator-pom
- dev
except:
- v-dev

# add support for go, and python as well
# before_install:
# # install go 1.5.2 and godep
# - wget https://storage.googleapis.com/golang/go1.5.2.linux-amd64.tar.gz
# - sudo tar -C /usr/local -xzf go1.5.2.linux-amd64.tar.gz
# - export GOROOT=/usr/local/go
# # Set GOPATH and Add Godeps dependencies to GOPATH and PATH
# - export GOPATH="${TRAVIS_BUILD_DIR}/Godeps/_workspace"
# - export PATH=$GOROOT/bin:$PATH
# - export PATH="${TRAVIS_BUILD_DIR}/Godeps/_workspace/bin:$PATH"
# - go get github.com/tools/godep
# TODO: if and when needed, enable python support and add it to CI, testing that the code works
# install python
# - sudo add-apt-repository ppa:fkrull/deadsnakes -y
# - sudo apt-get update
# - sudo apt-get -y install python2.7
before_install:
- go get github.com/tools/godep

install:
- make all

script:
- make test_java
script: true

cache:
directories:
- $HOME/.m2
- /usr/bin

before_deploy:
# Clean the v-dev release and tag we are using to release development version in CI
- sudo wget https://github.com/benchflow/devops/raw/dev/ci/clean_v-dev_release.sh -O /usr/bin/clean_v-dev_release.sh
- sudo chmod +x /usr/bin/clean_v-dev_release.sh
- export REPO_NAME=commons
- export USER_NAME=simonedavico
- /usr/bin/clean_v-dev_release.sh

deploy:
provider: releases
api_key:
secure: $GITHUB_ACCESS_TOKEN
file:
- keyname-hash-generator/java/target/benchflow-keyname-hash-generator.jar
- minio/java/target/benchflow-minio-client.jar
# - docker/go/src/cloud/benchflow/commons/docker/docker.go
# - kafka/go/src/cloud/benchflow/commons/kafka/kafka.go
# - keyname-hash-generator/go/src/cloud/benchflow/commons/hashing/hashing.go
# - minio/go/src/cloud/benchflow/commons/minio/minio.go
- docker/go/src/cloud/benchflow/commons/docker/docker.go
- kafka/go/src/cloud/benchflow/commons/kafka/kafka.go
- keyname-hash-generator/go/src/cloud/benchflow/commons/hashing/hashing.go
- minio/go/src/cloud/benchflow/commons/minio/minio.go
skip_cleanup: true
on:
tags: false
repo: simonedavico/commons
branch: fix-hash-generator-pom
repo: benchflow/commons
branch: dev
45 changes: 3 additions & 42 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,54 +1,15 @@
REPONAME = commons
DOCKERIMAGENAME = benchflow/$(REPONAME)
VERSION = dev
JAVA_VERSION_FOR_COMPILATION = (^|/)java-8-oracle($|\s)
UNAME = $(shell uname)

find_java:
ifeq ($(UNAME), Darwin)
$(eval JAVA_HOME := $(shell /usr/libexec/java_home))
else ifeq ($(UNAME),Linux)
ifndef TRAVIS
$(eval JAVA_HOME := $(shell update-java-alternatives -l | cut -d' ' -f3 | egrep '$(JAVA_VERSION_FOR_COMPILATION)'))
endif
endif
.PHONY: all build_release_go

.PHONY: all build_release_java build_release_go

all: build_release_java build_release_go
all: build_release_go

build_go:
$(MAKE) -C ./docker/go
$(MAKE) -C ./kafka/go
$(MAKE) -C ./keyname-hash-generator/go
$(MAKE) -C ./minio/go

build_release_go: build_go

clean_java:
cd keyname-hash-generator/java/ && \
JAVA_HOME=$(JAVA_HOME) mvn clean
$(MAKE) -C ./minio/java/ clean

build_java:
cd keyname-hash-generator/java/ && \
JAVA_HOME=$(JAVA_HOME) mvn package
$(MAKE) -C ./minio/java/ build

build_release_java:
# Install keyname-hash-generator so that can be used as dependency for the minio build
JAVA_HOME=$(JAVA_HOME) mvn package -pl minio/java -am install
# cd keyname-hash-generator/java/ && \
# JAVA_HOME=$(JAVA_HOME) mvn package && \
# JAVA_HOME=$(JAVA_HOME) mvn install
# $(MAKE) -C ./minio/java/ build_release

install_java:
cd keyname-hash-generator/java/ && \
JAVA_HOME=$(JAVA_HOME) mvn install
$(MAKE) -C ./minio/java/ install

test_java:
cd keyname-hash-generator/java/ && \
JAVA_HOME=$(JAVA_HOME) mvn test
$(MAKE) -C ./minio/java/ test
build_release_go: build_go
5 changes: 0 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,4 @@
<java.version>1.8</java.version>
</properties>

<modules>
<module>keyname-hash-generator/java</module>
<module>minio/java</module>
</modules>

</project>

0 comments on commit d158804

Please sign in to comment.