diff --git a/.ci/travis/docker_image/before_install.sh b/.ci/travis/docker_image/before_install.sh deleted file mode 100755 index 36c02ec0254..00000000000 --- a/.ci/travis/docker_image/before_install.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash -########################################################################### -# before_install.sh -# --------------------- -# Date : March 2019 -# Copyright : (C) 2019 by Denis Rouzaud -# Email : denis@opengis.ch -########################################################################### -# # -# This program is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -########################################################################### diff --git a/.ci/travis/docker_image/before_script.sh b/.ci/travis/docker_image/before_script.sh deleted file mode 100755 index 811844baa78..00000000000 --- a/.ci/travis/docker_image/before_script.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash -########################################################################### -# before_install.sh -# --------------------- -# Date : March 2019 -# Copyright : (C) 2019 by Denis Rouzaud -# Email : denis@opengis.ch -########################################################################### -# # -# This program is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -########################################################################### - - -set -e - -.ci/travis/scripts/echo_travis_var.sh - -pushd .docker - - - -echo "travis_fold:start:docker_build" -echo "${bold}Docker build deps${endbold}" -docker --version - -docker pull "qgis/qgis3-build-deps:${DOCKER_TAG}" || true -docker build --cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}" -t "qgis/qgis3-build-deps:${DOCKER_TAG}" -f ${DOCKER_BUILD_DEPS_FILE} . -echo "push to qgis/qgis3-build-deps:${DOCKER_TAG}" -docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" -docker push "qgis/qgis3-build-deps:${DOCKER_TAG}" - -echo "travis_fold:end:docker_build" - - -popd diff --git a/.ci/travis/docker_image/install.sh b/.ci/travis/docker_image/install.sh deleted file mode 100755 index 809a773fce4..00000000000 --- a/.ci/travis/docker_image/install.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash -########################################################################### -# before_install.sh -# --------------------- -# Date : March 2019 -# Copyright : (C) 2019 by Denis Rouzaud -# Email : denis@opengis.ch -########################################################################### -# # -# This program is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -########################################################################### - - diff --git a/.travis.yml b/.travis.yml index 4cafd54faea..44502417877 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -language: python # This lets us use newer python versions from virtualenv +language: python python: "3.7" compiler: clang dist: bionic @@ -8,8 +8,6 @@ cache: pip: true directories: - ${HOME}/.ccache_testing - - ${HOME}/.ccache_docker_build_focal - - ${HOME}/.ccache_docker_build_bionic timeout: 1000 if: NOT branch =~ /^(cherry-pick-)?backport-\d+-/ AND NOT branch =~ /-patch-\d+$/ @@ -49,6 +47,7 @@ matrix: # Label ID can be found here https://api.github.com/repos/qgis/QGIS/labels - RUN_FLAKY_TESTS=$(.ci/travis/scripts/pr_has_label.py $TRAVIS_PULL_REQUEST 1271248184) +<<<<<<< HEAD ########################################################## # CODE LAYOUT ########################################################## @@ -148,6 +147,8 @@ matrix: # allow_failures: # - os: osx +======= +>>>>>>> 440491d69f... remove Travis builds for Docker images (#38397) git: depth: 120