Skip to content

Commit 33f5e47

Browse files
authored
Merge pull request #1075 from watson-developer-cloud/util-script-cleanup
Clean up utility scripts for CI
2 parents a189252 + 0081be1 commit 33f5e47

File tree

7 files changed

+12
-104
lines changed

7 files changed

+12
-104
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ after_success:
5252
deploy:
5353
- provider: script
5454
skip_cleanup: true
55-
script: travis_wait 30 ./gradlew bintrayUpload
55+
script: ".utility/deploy-travis-wrapper.sh"
5656
on:
5757
tags: true
5858
jdk: openjdk7

.utility/deploy-travis-wrapper.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/bash
2+
3+
./gradlew bintrayUpload &
4+
5+
# output every 9 min to prevent a Travis timeout
6+
PID=$!
7+
while [[ $(ps -p $PID | tail -n +2) ]]; do
8+
echo 'Deploying...'
9+
sleep 540
10+
done

.utility/deploy.sh

Lines changed: 0 additions & 6 deletions
This file was deleted.

.utility/generate-api-diff.sh

Lines changed: 0 additions & 49 deletions
This file was deleted.
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ echo '<!DOCTYPE html>
1919
2020
<p><a href="https://www.ibm.com/watson/developer/">Info</a>
2121
| <a href="https://cloud.ibm.com/developer/watson/documentation">Documentation</a>
22-
| <a href="http://watson-developer-cloud.github.io/java-sdk/apidiff">API Diff</a>
2322
| <a href="https://github.com/watson-developer-cloud/java-sdk">GitHub</a>
2423
| <a href="http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.ibm.watson.developer_cloud%22%20a%3A%22java-sdk%22">Maven</a>
2524
</p>

.utility/generate_apidiff_index_html.sh

Lines changed: 0 additions & 39 deletions
This file was deleted.

.utility/push-javadoc-to-gh-pages.sh

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,7 @@ if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" ]; then
1111
rm -rf docs/$TRAVIS_BRANCH
1212
mkdir -p docs/$TRAVIS_BRANCH
1313
cp -rf ../build/docs/all/* docs/$TRAVIS_BRANCH
14-
../.utility/generate_index_html.sh > index.html
15-
16-
# produce API diff of the current version and the latest release
17-
../.utility/generate-api-diff.sh
18-
rm -rf apidiff/
19-
mkdir apidiff/
20-
cp -f ../build/reports/java-sdk-api-diff* apidiff/
21-
../.utility/generate_apidiff_index_html.sh > apidiff/index.html
14+
generate-index-html.sh > index.html
2215

2316
# update the latest/ symlink
2417
# on tagged builds, $TRAVIS_TAG is set to the tag, but it's blank on regular builds, unlike $TRAVIS_BRANCH

0 commit comments

Comments
 (0)