Skip to content

Commit

Permalink
Ninja fix tarball push to bintray
Browse files Browse the repository at this point in the history
Since the clean goal of maven was modified to delete everything under "src/packages" and the Makefile is calling mvn clean, we were deleting the tarball that was generated before calling "make".
I've moved the tarball generation after the "make" call to avoid having it deleted.
  • Loading branch information
adejanovski committed Oct 3, 2018
1 parent 9197ec0 commit 58b295c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions src/ci/before_deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ then
cp -R src/packaging/bin cassandra-reaper-master/
cp src/server/target/cassandra-reaper-*.jar cassandra-reaper-master/server/target
cp -R src/packaging/resource cassandra-reaper-master/
tar czf cassandra-reaper-${VERSION}.tar.gz cassandra-reaper-master/
sudo mv cassandra-reaper-${VERSION}.tar.gz src/packages/
# docker-compose based build stopped working so we fell back to raw fpm
sudo apt-get install ruby ruby-dev build-essential rpm -y
gem install --no-ri --no-rdoc fpm
Expand All @@ -49,6 +47,8 @@ then
sudo mv reaper_*_amd64.deb ../packages/
sudo mv reaper-*.x86_64.rpm ../packages/
cd ../..
tar czf cassandra-reaper-${VERSION}.tar.gz cassandra-reaper-master/
sudo mv cassandra-reaper-${VERSION}.tar.gz src/packages/
export GIT_HASH=$(git log --pretty=format:'%h' -n 1)
docker login -u $DOCKER_USER -p $DOCKER_PASS
export REPO=thelastpickle/cassandra-reaper
Expand All @@ -75,8 +75,6 @@ then
cp -R src/packaging/bin cassandra-reaper-${TRAVIS_TAG}/
cp src/server/target/cassandra-reaper-*.jar cassandra-reaper-${TRAVIS_TAG}/server/target
cp -R src/packaging/resource cassandra-reaper-${TRAVIS_TAG}/
tar czf cassandra-reaper-${TRAVIS_TAG}-release.tar.gz cassandra-reaper-${TRAVIS_TAG}/
sudo mv cassandra-reaper-${TRAVIS_TAG}-release.tar.gz src/packages/
# docker-compose based build stopped working so we fell back to raw fpm
sudo apt-get install ruby ruby-dev build-essential rpm -y
gem install --no-ri --no-rdoc fpm
Expand All @@ -85,6 +83,8 @@ then
sudo mv reaper_*_amd64.deb ../packages/
sudo mv reaper-*.x86_64.rpm ../packages/
cd ../..
tar czf cassandra-reaper-${TRAVIS_TAG}-release.tar.gz cassandra-reaper-${TRAVIS_TAG}/
sudo mv cassandra-reaper-${TRAVIS_TAG}-release.tar.gz src/packages/
docker login -u $DOCKER_USER -p $DOCKER_PASS
export REPO=thelastpickle/cassandra-reaper
mvn -B -pl src/server/ docker:build -Ddocker.directory=src/server/src/main/docker
Expand Down
2 changes: 1 addition & 1 deletion src/packaging/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ VERSION := `mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpr
# VERSION := `python -c "import xml.etree.ElementTree as ET; print(ET.parse(open('pom.xml')).getroot().find('{http://maven.apache.org/POM/4.0.0}version').text)"`

package:
mvn clean package -f ../../pom.xml -DskipTests
mvn -B clean package -f ../../pom.xml -DskipTests

prepare:
echo "$(VERSION)..."
Expand Down

0 comments on commit 58b295c

Please sign in to comment.