Skip to content

Commit b62e958

Browse files
authored
Merge pull request #45 from tomzo/dojo5
unpatch travis build, upgrade dojo to support multi-line envs
2 parents 6e27458 + 58d0401 commit b62e958

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ services:
44
- docker
55

66
env:
7-
- DOJO_VERSION=0.4.2
7+
- DOJO_VERSION=0.5.0
88

99
before_install:
1010
- sudo rm -f /usr/bin/dojo

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -889,7 +889,7 @@ dojo "gradle test jar"
889889

890890
Assuming you already have a working docker, you can install dojo with:
891891
```
892-
DOJO_VERSION=0.4.2
892+
DOJO_VERSION=0.5.0
893893
wget -O dojo https://github.com/ai-traders/dojo/releases/download/${DOJO_VERSION}/dojo_linux_amd64
894894
sudo mv dojo /usr/local/bin
895895
sudo chmod +x /usr/local/bin/dojo

ci.gocd.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ pipelines:
1717
destination: build/libs
1818
tasks:
1919
- exec:
20-
command: dojo
20+
command: /bin/bash
2121
arguments:
22-
- gradle test jar
22+
- -c
23+
- ./tasks.sh build
2324
- release:
2425
approval: manual
2526
clean_workspace: true

tasks.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
set -e
44

5-
# Fix for multi-line environment variables not working in docker envs
6-
unset TRAVIS_COMMIT_MESSAGE
7-
85
source .build/docker-ops
96
source .build/releaser
107

@@ -24,6 +21,9 @@ function get_version_tag {
2421

2522
command="$1"
2623
case "${command}" in
24+
build)
25+
dojo "gradle test jar"
26+
;;
2727
set_version)
2828
if [[ -n "$2" ]]; then
2929
next_version="$2"
@@ -79,4 +79,8 @@ case "${command}" in
7979
--name "json-config-plugin-$VERSION.jar" \
8080
--file build/libs/json-config-plugin-$VERSION.jar
8181
;;
82+
*)
83+
echo "Invalid command: '${command}'"
84+
exit 1
85+
;;
8286
esac

0 commit comments

Comments
 (0)