Skip to content

Commit e91dd86

Browse files
committed
add missing declaration
1 parent 3705e74 commit e91dd86

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

.travis.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ before_install:
1717
- echo GET CONFIG FROM GIT
1818
- export CURRENT_VERSION=$(git describe --tag --always --long | sed -e 's/\(.*\)-\(.*\)-.*/\1.\2/')
1919
- declare -a CURRENT_VERSION_ARRAY="(${CURRENT_VERSION//./ })"; export SEMVER_MAJOR=${CURRENT_VERSION_ARRAY[0]}; export SEMVER_MINOR=${CURRENT_VERSION_ARRAY[1]}; export SEMVER_PATCH=${CURRENT_VERSION_ARRAY[2]}; export SEMVER_BUILD=${CURRENT_VERSION_ARRAY[-1]}
20+
- export SEMVER_BUILD=$(( ${SEMVER_PATCH} + ${SEMVER_BUILD} ))
2021
- echo SEMVER_MAJOR:${SEMVER_MAJOR}
2122
- echo SEMVER_MINOR:${SEMVER_MINOR}
22-
- echo SEMVER_BUILD:$(( ${SEMVER_PATCH} + ${SEMVER_BUILD} ))
23+
- echo SEMVER_BUILD:${SEMVER_BUILD}
2324
- export SEMVER=${SEMVER_MAJOR}.${SEMVER_MINOR}.${SEMVER_BUILD}
2425
- echo SEMVER:$SEMVER
2526
- if [[ ${SEMVER_MAJOR} == "" ]]; then travis_terminate 1; fi
@@ -31,7 +32,7 @@ install:
3132
- docker build --pull -t $IMAGE:$IMAGE_VERSION --build-arg ORACLE_USERNAME=${ORACLE_USERNAME} --build-arg ORACLE_PASSWORD=${ORACLE_PASSWORD} .
3233
- export CONTAINER_COMMAND="docker run $IMAGE:$IMAGE_VERSION $TEST_COMMAND"
3334
- echo CONTAINER_COMMAND=$CONTAINER_COMMAND
34-
- export CONTAINER_OUTPUT=$(docker run $IMAGE:$IMAGE_VERSION java -version 2>&1 | grep "java version" | sed -e 's/.*java version "\(.*\)".*/\1/')
35+
- export CONTAINER_OUTPUT=$(eval $CONTAINER_COMMAND)
3536
- echo CONTAINER_OUTPUT=$CONTAINER_OUTPUT
3637
- docker tag $IMAGE:$IMAGE_VERSION $IMAGE:$CONTAINER_OUTPUT
3738
- if [[ ! ${CONTAINER_OUTPUT} =~ ${TEST_COMMAND_VERIFY} ]]; then travis_terminate 1; fi

0 commit comments

Comments
 (0)