Skip to content

Commit 689f3c7

Browse files
adejanovskiadejanovski
committed
Fix Travis build being killed
1 parent 35694c3 commit 689f3c7

File tree

8 files changed

+23
-23
lines changed

8 files changed

+23
-23
lines changed

‎src/ci/after_success.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ case "${TEST_TYPE}" in
1717
-Dsonar.login=${SONAR_TOKEN} \
1818
-Dsonar.projectKey=tlp-cassandra-reaper \
1919
-Dsonar.github.oauth=${GITHUB_TOKEN} \
20-
-Dsonar.github.repository=thelastpickle/cassandra-reaper
20+
-Dsonar.github.repository=thelastpickle/cassandra-reaper 1> /dev/null
2121
fi
2222
;;
2323
*)

‎src/ci/before_deploy.sh

+12-12
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,25 @@ then
1111
VERSION=$(printf 'VER\t${project.version}' | mvn help:evaluate | grep '^VER' | cut -f2)
1212
DATE=$(date +"%Y%m%d")
1313
RELEASEDATE=$(date +"%Y-%m-%d")
14-
RPM_VERSION=$(echo "${VERSION}-${DATE}" | sed "s/-/_/")
14+
RPM_VERSION=$(echo "${VERSION}" | sed "s/-/_/")
1515
# Update Bintray descriptor files with appropriate version numbers and release dates
16-
sed -i "s/VERSION/${VERSION}-${DATE}/" src/ci/descriptor-rpm-beta.json
16+
sed -i "s/VERSION/${VERSION}/" src/ci/descriptor-rpm-beta.json
1717
sed -i "s/RELEASEDATE/${RELEASEDATE}/" src/ci/descriptor-rpm-beta.json
18-
sed -i "s/VERSION/${VERSION}-${DATE}/" src/ci/descriptor-deb-beta.json
18+
sed -i "s/VERSION/${VERSION}/" src/ci/descriptor-deb-beta.json
1919
sed -i "s/RELEASEDATE/${RELEASEDATE}/" src/ci/descriptor-deb-beta.json
20-
sed -i "s/VERSION/${VERSION}-${DATE}/" src/ci/descriptor-tarball-beta.json
20+
sed -i "s/VERSION/${VERSION}/" src/ci/descriptor-tarball-beta.json
2121
sed -i "s/RELEASEDATE/${RELEASEDATE}/" src/ci/descriptor-tarball-beta.json
2222
mkdir -p cassandra-reaper-master/server/target
2323
cp -R src/packaging/bin cassandra-reaper-master/
2424
cp src/server/target/cassandra-reaper-*.jar cassandra-reaper-master/server/target
2525
cp -R src/packaging/resource cassandra-reaper-master/
26-
tar czf cassandra-reaper-${VERSION}-${DATE}.tar.gz cassandra-reaper-master/
27-
docker-compose -f src/packaging/docker-build/docker-compose.yml build > /dev/null
28-
docker-compose -f src/packaging/docker-build/docker-compose.yml run build > /dev/null
26+
tar czf cassandra-reaper-${VERSION}.tar.gz cassandra-reaper-master/
27+
docker-compose -f src/packaging/docker-build/docker-compose.yml build &> /dev/null
28+
docker-compose -f src/packaging/docker-build/docker-compose.yml run build &> /dev/null
2929
# Renaming the packages to avoid conflicts in Bintray
30-
sudo mv cassandra-reaper-${VERSION}-${DATE}.tar.gz src/packages/
31-
sudo mv src/packages/reaper_${VERSION}_amd64.deb src/packages/reaper_${VERSION}-${DATE}_amd64.deb
32-
sudo mv src/packages/reaper-*.x86_64.rpm src/packages/reaper-${RPM_VERSION}.x86_64.rpm
30+
sudo mv cassandra-reaper-${VERSION}.tar.gz src/packages/
31+
#sudo mv src/packages/reaper_${VERSION}_amd64.deb src/packages/reaper_${VERSION}-${DATE}_amd64.deb
32+
#sudo mv src/packages/reaper-*.x86_64.rpm src/packages/reaper-${RPM_VERSION}.x86_64.rpm
3333
fi
3434
if [ "x${TRAVIS_TAG}" != "x" -a ! -d "cassandra-reaper-${TRAVIS_TAG}" ]
3535
then
@@ -48,7 +48,7 @@ then
4848
cp -R src/packaging/resource cassandra-reaper-${TRAVIS_TAG}/
4949
tar czf cassandra-reaper-${TRAVIS_TAG}-release.tar.gz cassandra-reaper-${TRAVIS_TAG}/
5050
sudo mv cassandra-reaper-${TRAVIS_TAG}-release.tar.gz src/packages/
51-
docker-compose -f src/packaging/docker-build/docker-compose.yml build > /dev/null
52-
docker-compose -f src/packaging/docker-build/docker-compose.yml run build > /dev/null
51+
docker-compose -f src/packaging/docker-build/docker-compose.yml build &> /dev/null
52+
docker-compose -f src/packaging/docker-build/docker-compose.yml run build &> /dev/null
5353
fi
5454
fi

‎src/ci/script.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ case "${TEST_TYPE}" in
1010
exit 1
1111
;;
1212
"ccm")
13-
ccm start -v
13+
ccm start
1414
sleep 30
1515
ccm status
1616
ccm node1 nodetool status
@@ -26,7 +26,7 @@ case "${TEST_TYPE}" in
2626
if [ "x${GRIM_MIN}" = "x" ]
2727
then
2828
# Rebuild the UI to get the right version number there
29-
MAVEN_OPTS="-Xmx1g" mvn clean generate-sources -Pbuild-ui > /dev/null
29+
MAVEN_OPTS="-Xmx1g" mvn clean generate-sources -Pbuild-ui 1> /dev/null
3030
fi
3131

3232
MAVEN_OPTS="-Xmx1g" mvn clean install

‎src/server/src/main/resources/assets/deps.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/server/src/main/resources/assets/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
2121
<![endif]-->
2222

23-
<script type="text/javascript" src="deps.js?d33c74a42d4d1260c88a"></script><script type="text/javascript" src="index.js?d33c74a42d4d1260c88a"></script></head>
23+
<script type="text/javascript" src="deps.js?1c2bb1022e1510126bae"></script><script type="text/javascript" src="index.js?1c2bb1022e1510126bae"></script></head>
2424

2525
<body>
2626

‎src/server/src/main/resources/assets/repair.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
2121
<![endif]-->
2222

23-
<script type="text/javascript" src="deps.js?d33c74a42d4d1260c88a"></script><script type="text/javascript" src="repair.js?d33c74a42d4d1260c88a"></script></head>
23+
<script type="text/javascript" src="deps.js?1c2bb1022e1510126bae"></script><script type="text/javascript" src="repair.js?1c2bb1022e1510126bae"></script></head>
2424

2525
<body>
2626

‎src/server/src/main/resources/assets/schedules.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
2121
<![endif]-->
2222

23-
<script type="text/javascript" src="deps.js?d33c74a42d4d1260c88a"></script><script type="text/javascript" src="schedules.js?d33c74a42d4d1260c88a"></script></head>
23+
<script type="text/javascript" src="deps.js?1c2bb1022e1510126bae"></script><script type="text/javascript" src="schedules.js?1c2bb1022e1510126bae"></script></head>
2424

2525
<body>
2626

‎src/ui/app/jsx/navbar.jsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const NavBar = React.createClass({
3333
</div>
3434
</div>
3535
<div className="col-lg-4">
36-
<span className="navbar-brand" style={floatRight}><Button href="https://github.com/thelastpickle/cassandra-reaper/issues/new?body=**Spotted on 1.1.0-SNAPSHOT (66d97b4)**" bsStyle="warning" bsSize="xsmall">Report a bug</Button>
36+
<span className="navbar-brand" style={floatRight}><Button href="https://github.com/thelastpickle/cassandra-reaper/issues/new?body=**Spotted on 1.1.0-SNAPSHOT (35694c3)**" bsStyle="warning" bsSize="xsmall">Report a bug</Button>
3737
</span>
3838
</div>
3939
<Modal show={this.state.showModal} onHide={this.close}>
@@ -42,9 +42,9 @@ const NavBar = React.createClass({
4242
</Modal.Header>
4343
<Modal.Body>
4444
<h4>Git commit :</h4>
45-
<p><a href="https://github.com/thelastpickle/cassandra-reaper/commit/66d97b4" target="_blank">https://github.com/thelastpickle/cassandra-reaper/commit/66d97b4</a></p>
45+
<p><a href="https://github.com/thelastpickle/cassandra-reaper/commit/35694c3" target="_blank">https://github.com/thelastpickle/cassandra-reaper/commit/35694c3</a></p>
4646
<h4>Build date :</h4>
47-
<p>2018-01-12 13:27:38</p>
47+
<p>2018-02-07 07:39:51</p>
4848
</Modal.Body>
4949
<Modal.Footer>
5050
<Button onClick={this.close}>Close</Button>

0 commit comments

Comments
 (0)