add missing declaration

aem-design · Oct 2, 2019 · e91dd86 · e91dd86
1 parent 3705e74
commit e91dd86
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,9 +17,10 @@ before_install:
   - echo GET CONFIG FROM GIT
   - export CURRENT_VERSION=$(git describe --tag --always --long | sed -e 's/\(.*\)-\(.*\)-.*/\1.\2/')
   - 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]}
+  - export SEMVER_BUILD=$(( ${SEMVER_PATCH} + ${SEMVER_BUILD} ))
   - echo SEMVER_MAJOR:${SEMVER_MAJOR}
   - echo SEMVER_MINOR:${SEMVER_MINOR}
-  - echo SEMVER_BUILD:$(( ${SEMVER_PATCH} + ${SEMVER_BUILD} ))
+  - echo SEMVER_BUILD:${SEMVER_BUILD}
   - export SEMVER=${SEMVER_MAJOR}.${SEMVER_MINOR}.${SEMVER_BUILD}
   - echo SEMVER:$SEMVER
   - if [[ ${SEMVER_MAJOR} == "" ]]; then travis_terminate 1; fi
@@ -31,7 +32,7 @@ install:
   - docker build --pull -t $IMAGE:$IMAGE_VERSION --build-arg ORACLE_USERNAME=${ORACLE_USERNAME} --build-arg ORACLE_PASSWORD=${ORACLE_PASSWORD} .
   - export CONTAINER_COMMAND="docker run $IMAGE:$IMAGE_VERSION $TEST_COMMAND"
   - echo CONTAINER_COMMAND=$CONTAINER_COMMAND
-  - export CONTAINER_OUTPUT=$(docker run $IMAGE:$IMAGE_VERSION java -version 2>&1 | grep "java version" | sed -e 's/.*java version "\(.*\)".*/\1/')
+  - export CONTAINER_OUTPUT=$(eval $CONTAINER_COMMAND)
   - echo CONTAINER_OUTPUT=$CONTAINER_OUTPUT
   - docker tag $IMAGE:$IMAGE_VERSION $IMAGE:$CONTAINER_OUTPUT
   - if [[ ! ${CONTAINER_OUTPUT} =~ ${TEST_COMMAND_VERIFY} ]]; then travis_terminate 1; fi