Skip to content
Permalink
Browse files

fix bad rebase

  • Loading branch information
3nids authored and nyalldawson committed Sep 3, 2020
1 parent e355cd1 commit c8eae9b8e81b16cf3b665811316d916981c301dd
Showing with 0 additions and 62 deletions.
  1. +0 −62 .travis.yml
@@ -47,7 +47,6 @@ 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
##########################################################
@@ -88,67 +87,6 @@ matrix:
- libstring-escape-perl
- libtry-tiny-perl



##########################################################
#
# DOCKER IMAGE BUILD JOBS ON CRON OR TAG
#
##########################################################


##########################################################
# BIONIC DOCKER BUILD ON CRON OR TAG
##########################################################
- os: linux
name: bionic docker build 🐳
if: repo = qgis/QGIS AND (tag IS PRESENT OR type = cron)
services: docker
sudo: required # required to restart Docker Daemon with experimental features
env:
- TRAVIS_CONFIG=docker_image
- CCACHE_DIR=${HOME}/.ccache_docker_build_bionic
- TRIGGER_PYQGIS_DOC=FALSE
- DOCKER_TAG=$( echo $TRAVIS_BRANCH | sed 's/master/latest/' )
- DOCKER_BUILD_DEPS_FILE=qgis3-build-deps.dockerfile
- CC=/usr/lib/ccache/clang
- CXX=/usr/lib/ccache/clang++

##########################################################
# FOCAL DOCKER BUILD ON CRON OR TAG
##########################################################
- os: linux
name: focal docker build
if: repo = qgis/QGIS AND (tag IS PRESENT OR type = cron)
services: docker
sudo: required # required to restart Docker Daemon with experimental features
env:
- TRAVIS_CONFIG=docker_image
- CCACHE_DIR=${HOME}/.ccache_docker_build_focal
- TRIGGER_PYQGIS_DOC=TRUE
- DOCKER_TAG="$( echo $TRAVIS_BRANCH | sed 's/master/latest/' )_focal"
- DOCKER_BUILD_DEPS_FILE=qgis3-build-deps-focal.dockerfile
- CC=/usr/lib/ccache/gcc
- CXX=/usr/lib/ccache/g++ # Building SIP binding freezes with Clang in Docker, maybe a SIP issue, maybe not



# OSX based build with QT4 and Python 2
# - os: osx
# osx_image: xcode8.3 # MacOS 10.12: Sierra
# cache:
# pip: true
# directories:
# - $HOME/.ccache
# env:
# - TRAVIS_CONFIG=macos
# - IGNORE_BUILD_FAILURES=YES
#
# allow_failures:
# - os: osx

=======
>>>>>>> 440491d69f... remove Travis builds for Docker images (#38397)
git:
depth: 120

0 comments on commit c8eae9b

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