File tree 1 file changed +3
-2
lines changed
1 file changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -17,9 +17,10 @@ before_install:
17
17
- echo GET CONFIG FROM GIT
18
18
- export CURRENT_VERSION=$(git describe --tag --always --long | sed -e 's/\(.*\)-\(.*\)-.*/\1.\2/')
19
19
- 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} ))
20
21
- echo SEMVER_MAJOR:${SEMVER_MAJOR}
21
22
- echo SEMVER_MINOR:${SEMVER_MINOR}
22
- - echo SEMVER_BUILD:$(( ${SEMVER_PATCH} + ${ SEMVER_BUILD} ))
23
+ - echo SEMVER_BUILD:${ SEMVER_BUILD}
23
24
- export SEMVER=${SEMVER_MAJOR}.${SEMVER_MINOR}.${SEMVER_BUILD}
24
25
- echo SEMVER:$SEMVER
25
26
- if [[ ${SEMVER_MAJOR} == "" ]]; then travis_terminate 1; fi
@@ -31,7 +32,7 @@ install:
31
32
- docker build --pull -t $IMAGE:$IMAGE_VERSION --build-arg ORACLE_USERNAME=${ORACLE_USERNAME} --build-arg ORACLE_PASSWORD=${ORACLE_PASSWORD} .
32
33
- export CONTAINER_COMMAND="docker run $IMAGE:$IMAGE_VERSION $TEST_COMMAND"
33
34
- 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 )
35
36
- echo CONTAINER_OUTPUT=$CONTAINER_OUTPUT
36
37
- docker tag $IMAGE:$IMAGE_VERSION $IMAGE:$CONTAINER_OUTPUT
37
38
- if [[ ! ${CONTAINER_OUTPUT} =~ ${TEST_COMMAND_VERIFY} ]]; then travis_terminate 1; fi
You can’t perform that action at this time.
0 commit comments