Skip to content
Permalink
Browse files

Sibling of f342df3

  • Loading branch information
nyalldawson committed Apr 1, 2019
1 parent 8e9d0f7 commit 15a9ddb4e8734be59d64610f7b9dc8b5af1a1ab3
Showing 1,573 changed files with 21,802 additions and 37,823 deletions.
@@ -1,6 +1,6 @@

# Env variables for Docker
# These without assignment are taken from the host env variables
# These without assignment are taken from the host env variabbles

# TRAVIS variables
TRAVIS_AVAILABLE_TIME
@@ -11,7 +11,6 @@ TRAVIS_PULL_REQUEST
TRAVIS_OS_NAME
TRAVIS_CONFIG
TRAVIS
RUN_FLAKY_TESTS

# CTEST
LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
@@ -16,8 +16,6 @@

set -e

echo "Running flaky test: ${RUN_FLAKY_TESTS}"

# build QGIS in docker
echo "travis_fold:start:docker_build_qgis"
echo "${bold}Docker build QGIS${endbold}"
@@ -18,8 +18,6 @@ qgis_openstreetmaptest
qgis_wcsprovidertest
PyQgsWFSProviderGUI
qgis_ziplayertest
qgis_fieldcalculatortest
qgis_attributetabletest

# Flaky, see https://dash.orfeo-toolbox.org/testDetails.php?test=63061783&build=297405
PyQgsSpatialiteProvider

This file was deleted.

@@ -143,10 +143,6 @@ RUN locale-gen

RUN echo "alias python=python3" >> ~/.bash_aliases

# OTB: download and install otb packages for QGIS tests
RUN curl -k https://orfeo-toolbox.org/qgis/OTB-Linux64.run -o /tmp/OTB-Linux64.run && sh /tmp/OTB-Linux64.run --target /opt/otb
ENV OTB_INSTALL_DIR=/opt/otb

ENV CC=/usr/lib/ccache/clang
ENV CXX=/usr/lib/ccache/clang++
ENV QT_SELECT=5
@@ -11,7 +11,7 @@ cache:
- ${HOME}/.ccache_docker_build_cosmic
- ${HOME}/.ccache_docker_build_bionic
timeout: 1000
if: NOT branch =~ /^(cherry-pick-)?backport-\d+-on-/ AND NOT branch =~ /-patch-\d+$/
if: NOT branch =~ /^(cherry-pick-)?backport-\d+-on-/

env:
global:
@@ -46,8 +46,6 @@ matrix:
- CCACHE_DIR=${HOME}/.ccache_testing
- DOCKER_TAG=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && echo $TRAVIS_BRANCH | sed 's/master/latest/' || echo "latest" )
- DOCKER_BUILD_DEPS_FILE=qgis3-build-deps.dockerfile
# 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)

##########################################################
# CODE LAYOUT
@@ -11,10 +11,10 @@ CMAKE_POLICY (SET CMP0053 NEW)
#############################################################
# Project and version
SET(CPACK_PACKAGE_VERSION_MAJOR "3")
SET(CPACK_PACKAGE_VERSION_MINOR "7")
SET(CPACK_PACKAGE_VERSION_PATCH "0")
SET(CPACK_PACKAGE_VERSION_MINOR "6")
SET(CPACK_PACKAGE_VERSION_PATCH "1")
SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
SET(RELEASE_NAME "Master")
SET(RELEASE_NAME "Noosa")
PROJECT(qgis VERSION ${COMPLETE_VERSION})

IF (APPLE)

0 comments on commit 15a9ddb

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