Merge pull request #9392 from rifelpet/ghactionstest

Revert "try github actions failures to see if PRs can't be merged"
kubernetes · Jun 18, 2020 · 296f657 · 296f657
2 parents 88b53ca + 6b66924
commit 296f657
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git 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
@@ -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