From 6b6692494fcce77e53a20643f31855150896afeb Mon Sep 17 00:00:00 2001
From: Peter Rifel <pgrifel@gmail.com>
Date: Wed, 17 Jun 2020 23:18:58 -0500
Subject: [PATCH] Revert "try github actions failures to see if PRs can't be
 merged"

This reverts commit b85c0a47e537d7039a0c911520eb07f9687b3710.
---
 .github/workflows/main.yml |  4 ++--
 .travis.yml                | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a397b5bee0..9d48175f66 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -39,7 +39,7 @@ jobs:
       - name: make nodeup examples test
         working-directory: ${{ env.GOPATH }}/src/k8s.io/kops
         run: |
-          foo
+          make nodeup examples test
 
   verify:
     strategy:
@@ -64,4 +64,4 @@ jobs:
       - name: make travis-ci
         working-directory: ${{ env.GOPATH }}/src/k8s.io/kops
         run: |
-          foo
+          make travis-ci
diff --git a/.travis.yml b/.travis.yml
index a2777e1582..532b249e11 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,12 @@
 language: go
 arch:
+  - amd64
   - arm64
 os:
   - linux
+  - osx
 go:
+  - 1.13.x
   - 1.14.x
 
 go_import_path: k8s.io/kops
@@ -14,3 +17,18 @@ script:
 jobs:
   allow_failures:
     - arch: arm64
+
+  exclude:
+    - os: osx
+      go: 1.13.x
+    - os: linux
+      go: 1.13.x
+      arch: arm64
+
+  include:
+    - name: Verify
+      arch: amd64
+      os: linux
+      go: 1.13.x
+      script:
+        - GOPROXY=https://proxy.golang.org make travis-ci