Skip to content

Commit

Permalink
Fix build stage variant suffix
Browse files Browse the repository at this point in the history
Underscores are part of the variable name.
Use dashes instead.
  • Loading branch information
jolting authored and jlblancoc committed May 28, 2018
1 parent e417d53 commit 8cbec87
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions travis/travis_docker.sh
Expand Up @@ -3,16 +3,16 @@ set -e # Make sure any error makes the script to return an error code

if [ "$STAGE" == "1" ]; then
export STAGE_INPUT_IMAGE=mrpt/mrpt-build-env:$DEPS-bionic
export STAGE_OUTPUT_IMAGE=mrpt/mrpt-travis-archive:$DEPS-$CC-$TRAVIS_COMMIT_1
export STAGE_OUTPUT_IMAGE=mrpt/mrpt-travis-archive:$DEPS-$CC-$TRAVIS_COMMIT-1
fi

if [ "$STAGE" == "2" ]; then
export STAGE_INPUT_IMAGE=mrpt/mrpt-travis-archive:$DEPS-$CC-$TRAVIS_COMMIT_1
export STAGE_OUTPUT_IMAGE=mrpt/mrpt-travis-archive:$DEPS-$CC-$TRAVIS_COMMIT_2
export STAGE_INPUT_IMAGE=mrpt/mrpt-travis-archive:$DEPS-$CC-$TRAVIS_COMMIT-1
export STAGE_OUTPUT_IMAGE=mrpt/mrpt-travis-archive:$DEPS-$CC-$TRAVIS_COMMIT-2
fi

if [ "$STAGE" == "3" ]; then
export STAGE_INPUT_IMAGE=mrpt/mrpt-travis-archive:$DEPS-$CC-$TRAVIS_COMMIT_2
export STAGE_INPUT_IMAGE=mrpt/mrpt-travis-archive:$DEPS-$CC-$TRAVIS_COMMIT-2
fi

docker run -v $HOME:$HOME $CODECOV_VARS -e CC -e BUILD_TARGET -e STAGE -e BUILD_TYPE -e MAKEFLAGS -e CCACHE_SLOPPINESS -e TASK -e DEPS -e CI_SOURCE_PATH -e REPOSITORY_NAME -e HOME -e DISTRO -e CI_ROS_DISTRO -e CODECOV_TOKEN --name mrptbuild $STAGE_INPUT_IMAGE bash -c 'cd $CI_SOURCE_PATH; apt-get update -qq ; source travis/check_style.sh; source travis/travis_main.sh'
Expand Down

0 comments on commit 8cbec87

Please sign in to comment.