Merge pull request #3634 from pi-hole/new/move_travis

.travis.yml is now a stub.
2020-07-30 11:46:37 -07:00
parent 48820d181c fa574cfd08
commit 18fc45c006
1 changed files with 5 additions and 12 deletions
--- 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/.github:/build-configs/core.yml@main
+    if: branch = master
+  - source: pi-hole/.github:/build-configs/core.yml@latest
+    if: branch != master