diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 0fe57ab80e..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,22 +0,0 @@ -env: - global: - - KUBE_VERSION: 1.13 -language: go -go: - - 1.11.5 - -jobs: - include: - - name: "Testing examples" - cache: - directories: - - $HOME/.cache/go-build - install: - - bash scripts/test_examples.sh install - script: - - bash scripts/test_examples.sh run - - name: "Hugo build" - install: - - make travis-hugo-build - script: - - hugo diff --git a/Makefile b/Makefile index f44e04b46e..88d277e5c4 100644 --- a/Makefile +++ b/Makefile @@ -24,9 +24,9 @@ functions-build: check-headers-file: scripts/check-headers-file.sh -production-build: check-hugo-versions build check-headers-file ## Build the production site and ensure that noindex headers aren't added +production-build: test-examples check-hugo-versions build check-headers-file ## Build the production site and ensure that noindex headers aren't added -non-production-build: check-hugo-versions ## Build the non-production site, which adds noindex headers to prevent indexing +non-production-build: test-examples check-hugo-versions ## Build the non-production site, which adds noindex headers to prevent indexing hugo --enableGitInfo sass-build: @@ -47,12 +47,9 @@ docker-build: docker-serve: $(DOCKER_RUN) -p 1313:1313 $(DOCKER_IMAGE) hugo server --buildFuture --bind 0.0.0.0 -# This command is used only by Travis CI; do not run this locally -travis-hugo-build: - curl -L https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_VERSION}_linux-64bit.tar.gz | tar -xz - mkdir -p ${TRAVIS_HOME}/bin - mv hugo ${TRAVIS_HOME}/bin - export PATH=${TRAVIS_HOME}/bin:$PATH +test-examples: + scripts/test_examples.sh install + scripts/test_examples.sh run check-hugo-versions: scripts/hugo-version-check.sh $(HUGO_VERSION) diff --git a/scripts/test_examples.sh b/scripts/test_examples.sh old mode 100644 new mode 100755 index 9938477871..baee55c6ba --- a/scripts/test_examples.sh +++ b/scripts/test_examples.sh @@ -13,10 +13,6 @@ for f in $FILES; do TEST_EXAMPLES=Yes break fi - if [[ $f =~ ".travis.yml" ]]; then - TEST_EXAMPLES=Yes - break - fi done function install() {