Merge branch 'next' into finalizer-cleanup

Kong · Jul 12, 2021 · 7fdab82 · 7fdab82
2 parents d2781de + 815a74c
commit 7fdab82
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/1x-integration-test.yaml b/.github/workflows/1x-integration-test.yaml
@@ -3,11 +3,11 @@ name: 1.x Integration Tests
 on:
   pull_request:
     branches:
-      - 'main'
-      - 'next'
+      - '*'
   push:
     branches:
-      - '*'
+      - 'main'
+      - 'next'
     tags:
       - '1.*'
       - 'v1.*'

diff --git a/.github/workflows/2x-integration-test.yaml b/.github/workflows/2x-integration-test.yaml
@@ -3,11 +3,11 @@ name: 2.x Integration Tests
 on:
   pull_request:
     branches:
-      - 'main'
-      - 'next'
+      - '*'
   push:
     branches:
-      - '*'
+      - 'main'
+      - 'next'
     tags:
       - '2.*'
       - 'v2.*'

diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
 # only for dev
 DB?=false
 RUN_VERSION?=20
-KUBE_VERSION?=v1.20.2
+KUBE_VERSION?=v1.20.7
 
 PKG_LIST := ./...