Skip to content

Commit

Permalink
Hub is required on the host.
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonathan Oliver committed Sep 20, 2018
1 parent 4b35836 commit 7cef3eb
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 1 addition & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,4 @@ RUN apk add -u make git gnupg \
&& wget -O - "https://github.com/smartystreets/version-tools/releases/download/0.0.6/release.tar.gz" | tar -xz -C /usr/local/bin/ \
&& cp -r lib/.gnupg ~/ \
&& mkdir -p ~/.m2 && cp lib/settings.xml ~/.m2/ \
&& sed -i -r "s/PASSWORD/${OSSRH_PASSWORD}/g" ~/.m2/settings.xml \
&& mkdir /lib64 && ln -s /lib/libc.musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2 \
&& wget -O - "https://github.com/github/hub/releases/download/v2.5.1/hub-linux-amd64-2.5.1.tgz" | tar -xz -C /usr/local/ --strip 1
&& sed -i -r "s/PASSWORD/${OSSRH_PASSWORD}/g" ~/.m2/settings.xml
12 changes: 7 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@ package:

publish: version
GPG_TTY="$(shell tty)" mvn deploy \
&& git checkout "$(VERSION_FILE1)" "$(VERSION_FILE2)" \
&& hub release create -m "v$(VERSION) Release" "$(VERSION)" \
-a target/smartystreets-java-sdk-$(VERSION)-with-dependencies.jar \
-a target/smartystreets-java-sdk-$(VERSION)-javadoc.jar
&& git checkout "$(VERSION_FILE1)" "$(VERSION_FILE2)"

version:
sed -i -r "s/0\.0\.0/$(VERSION)/g" "$(VERSION_FILE1)"
Expand All @@ -37,6 +34,11 @@ workspace:
docker-compose run sdk /bin/sh

release:
docker-compose run sdk make publish && tagit -p && git push origin --tags
docker-compose run sdk make publish \
&& tagit -p \
&& git push origin --tags \
&& hub release create -m "v$(VERSION) Release" "$(VERSION)" \
-a target/smartystreets-java-sdk-$(VERSION)-with-dependencies.jar \
-a target/smartystreets-java-sdk-$(VERSION)-javadoc.jar

.PHONY: clean test compile verify package publish version workspace release

0 comments on commit 7cef3eb

Please sign in to comment.