From dc2781d1f9aa58b4bc09d0958f658be6f8da238f Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Thu, 30 Jul 2020 09:14:05 -0700 Subject: [PATCH 1/3] .travis.yml is now a stub. Signed-off-by: Dan Schaper --- .travis.yml | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 274c28cb..99882270 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,5 @@ -sudo: required -services: - - docker -language: python -python: - - "3.6" -install: - - pip install -r requirements.txt - -script: - # tox.ini handles setup, ordering of docker build first, and then run tests - - tox +import: + - source: pi-hole/pi-hole:/shared-configs:core.yml@main + if: branch = master + - source: pi-hole/pi-hole:/shared-configs:core.yml@main + if: branch != master From 932cdd33294d4dd407e8f050a912a6236046b25a Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Thu, 30 Jul 2020 09:31:48 -0700 Subject: [PATCH 2/3] Use the .github repository. Signed-off-by: Dan Schaper --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 99882270..7092049f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ import: - - source: pi-hole/pi-hole:/shared-configs:core.yml@main + - source: pi-hole/.github:/build-configs/core.yml@main if: branch = master - - source: pi-hole/pi-hole:/shared-configs:core.yml@main + - source: pi-hole/.github:/build-configs/core.yml@main if: branch != master From fa574cfd0851091f94b8a71f5adabba41273332f Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Thu, 30 Jul 2020 10:05:27 -0700 Subject: [PATCH 3/3] Set non-master to point to latest. Signed-off-by: Dan Schaper --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7092049f..3d80ab6e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ import: - source: pi-hole/.github:/build-configs/core.yml@main if: branch = master - - source: pi-hole/.github:/build-configs/core.yml@main + - source: pi-hole/.github:/build-configs/core.yml@latest if: branch != master