Skip to content

Commit

Permalink
Update Makefile and README for release
Browse files Browse the repository at this point in the history
  • Loading branch information
sodre committed Oct 9, 2017
1 parent 11ff887 commit 3448d70
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 31 deletions.
30 changes: 5 additions & 25 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@

CSD_VERSION=0.0.1

TAG:=$(shell git describe --tags | sed -e 's/^v//')
TAG_DIST=$(shell echo $(TAG) | sed -r -e 's/.*-([[:digit:]]+)-g.*/\1/')
TAG_HASH=$(shell echo $(TAG) | sed -r -e 's/^.*(g[0-9a-f]+|$$)/\1/')
Expand Down Expand Up @@ -35,20 +32,20 @@ clean:
release: $(foreach PARCEL,$(PARCELS),release/$(PARCEL)) release/manifest.json

%/manifest.json: make_manifest.py
mkdir -p $(shell dirname $@)
@mkdir -p $(shell dirname $@)
python make_manifest.py $(shell dirname $@)

NIFI-$(VERSION)-%.parcel: NIFI-$(VERSION).parcel
mkdir -p $(shell dirname $@)
@mkdir -p $(shell dirname $@)
ln $< $@
java -jar validator.jar -f $@

NIFI-$(VERSION).parcel: NIFI-$(VERSION)/meta
mkdir -p $(shell dirname $@)
@mkdir -p $(shell dirname $@)
tar zcvf $@ --owner root --group=root $(shell dirname $<)

NIFI-$(VERSION)/meta: NIFI-$(VERSION) meta validator.jar
mkdir $@
@mkdir $@
cp meta/nifi_env.sh $@
cat meta/parcel.json | jq ".version=\"$(VERSION)\"" > $@/parcel.json
java -jar validator.jar -p $@/parcel.json || (rm -rf $@ && false)
Expand All @@ -58,21 +55,7 @@ NIFI-$(VERSION): nifi-$(NIFI_VERSION)-bin.tar.gz
tar -zxf $<
mv nifi-$(NIFI_VERSION) $@


csd/images/icon.png:
convert nifi16.ico $@

# Remote dependencies
ghr:
wget https://github.com/tcnksm/ghr/releases/download/v0.5.4/ghr_v0.5.4_linux_amd64.zip -O ghr.zip
unzip ghr.zip
rm ghr.zip

gh-release:
wget https://github.com/progrium/gh-release/releases/download/v2.2.1/gh-release_2.2.1_linux_x86_64.tgz -O gh-release.tgz
tar -xf gh-release.tgz
rm gh-release.tgz

validator.jar:
cd tools/cm_ext && mvn -q install && cd -
ln tools/cm_ext/validator/target/validator.jar .
Expand All @@ -85,9 +68,6 @@ nifi-$(NIFI_VERSION)-bin.tar.gz: nifi-$(NIFI_VERSION)-bin.tar.gz-SHA256
touch $@
sha256sum -c $<

nifi16.ico:
wget https://nifi.apache.org/assets/images/nifi16.ico

# Auto Rules
# Implicit rules
%-SHA256: SHA256SUMS
grep $(subst -SHA256,,$@) SHA256SUMS > $@
14 changes: 8 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
# nifi-cdh
nifi-cdh is a CDH5.x parcel for Apache's NiFi system.
# nifi-parcel
nifi-parcel is a CDH5.x parcel for Apache's NiFi system.
[![Build Status](https://travis-ci.org/nomr/nifi-parcel.svg?branch=master)](https://travis-ci.org/nomr/nifi-parcel)

## Requirements

- jq
- Java 7 or higher
- Maven 3
- Python 2.7/3.3 or higher
- ImageMagick

## Build Instructions
1. Run `make`

1. Create a new tag
2. Run `make`
## Release Instructions

## Travis
1. Tag a release, the format is 'v<nifi version>+nifi<parcel version>'.
2. Push it to github.
3. Wait for Travis to build it.

0 comments on commit 3448d70

Please sign in to comment.