Skip to content
Permalink
Browse files

remove left over

  • Loading branch information
3nids committed Nov 16, 2018
1 parent 2cfb1b5 commit 53cd45354194db68c609eddf29881cb53b7b4887
Showing with 2 additions and 10 deletions.
  1. +0 −6 .ci/travis/linux/before_script.sh
  2. +2 −4 .ci/travis/linux/script.sh
@@ -18,14 +18,8 @@ set -e

pushd .docker

source $(git rev-parse --show-toplevel)/.ci/travis/scripts/travis_envvar_helper.sh


DOCKER_DEPS_PUSH=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && [[ $TRAVIS_EVENT_TYPE =~ push ]] && echo "true" || echo "false" )
DOCKER_DEPS_IMAGE_REBUILD=$( [[ $TRAVIS_COMMIT_MESSAGE =~ '[docker] update dependencies' ]] && echo "true" || echo "false" )
# on cron job, QGIS image is built and push without testing
DOCKER_QGIS_IMAGE_BUILD_PUSH=$(create_qgis_image)


echo "travis_fold:start:travis_env"
echo "${bold}Travis environment variables${endbold}"
@@ -16,13 +16,10 @@

set -e

source $(git rev-parse --show-toplevel)/.ci/travis/scripts/travis_envvar_helper.sh

DOCKER_QGIS_IMAGE_BUILD_PUSH=$(create_qgis_image)

mkdir -p "$CCACHE_DIR"

if [[ DOCKER_BUILD_QGIS_IMAGE =~ true ]]; then
# building docker images
DIR=$(git rev-parse --show-toplevel)/.docker
pushd "${DIR}"
echo "${bold}Building QGIS Docker image '${DOCKER_TAG}'...${endbold}"
@@ -36,5 +33,6 @@ if [[ DOCKER_BUILD_QGIS_IMAGE =~ true ]]; then
docker push "qgis/qgis:${DOCKER_TAG}"
popd
else
# running tests
docker-compose -f "${DOCKER_COMPOSE}" run --rm qgis-deps
fi

0 comments on commit 53cd453

Please sign in to comment.
You can’t perform that action at this time.