Merge pull request doriordan#154 from hagay3/feature/hagai/minikubev2…

…1v22 ci: add v1.21 v1.22 v1.23 v1.24
cedarm · May 29, 2022 · eeb13d7 · eeb13d7
2 parents 95ae7fd + fd61ebb
commit eeb13d7
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -135,7 +135,7 @@ jobs:
       - name: Checkout current branch (fast)
         uses: actions/checkout@v2
 
-      - uses: manusa/actions-setup-minikube@v2.5.0
+      - uses: manusa/actions-setup-minikube@v2.6.0
         with:
           minikube version: v1.23.2
           kubernetes version: v1.19.6
@@ -155,10 +155,30 @@ jobs:
       - name: Checkout current branch (fast)
         uses: actions/checkout@v2
 
-      - uses: manusa/actions-setup-minikube@v2.5.0
+      - uses: manusa/actions-setup-minikube@v2.6.0
         with:
           minikube version: v1.23.2
           kubernetes version: v1.20.11
           github token: ${{ secrets.GITHUB_TOKEN }}
 
       - run: sbt ++${{ matrix.scala }} It/test
+
+  integration-kubernetes-v1-21:
+    name: integration-kubernetes-v1-21
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        scala: [2.13.4]
+        java: [adopt@1.8]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout current branch (fast)
+        uses: actions/checkout@v2
+
+      - uses: manusa/actions-setup-minikube@v2.6.0
+        with:
+          minikube version: v1.23.2
+          kubernetes version: v1.21.5
+          github token: ${{ secrets.GITHUB_TOKEN }}
+
+      - run: sbt ++${{ matrix.scala }} It/test
diff --git a/build.sbt b/build.sbt
@@ -88,7 +88,7 @@ def workflowJobMinikube(jobName: String, k8sServerVersion: String) = {
     steps = List(
       WorkflowStep.Checkout,
       WorkflowStep.Use(
-        ref = UseRef.Public(owner = "manusa", repo = "actions-setup-minikube", ref = "v2.5.0"),
+        ref = UseRef.Public(owner = "manusa", repo = "actions-setup-minikube", ref = "v2.6.0"),
         params = Map(
           "minikubeversion" -> "v1.23.2",
           "kubernetesversion" -> k8sServerVersion,
@@ -107,7 +107,8 @@ inThisBuild(List(
   githubWorkflowBuild := Seq(WorkflowStep.Sbt(List("test", "It/compile"))),
   githubWorkflowAddedJobs := Seq(
     workflowJobMinikube(jobName = "integration-kubernetes-v1-19", k8sServerVersion = "v1.19.6"),
-    workflowJobMinikube(jobName = "integration-kubernetes-v1-20", k8sServerVersion = "v1.20.11")
+    workflowJobMinikube(jobName = "integration-kubernetes-v1-20", k8sServerVersion = "v1.20.11"),
+    workflowJobMinikube(jobName = "integration-kubernetes-v1-21", k8sServerVersion = "v1.21.5")
   ),
   githubWorkflowPublish := Seq(
     WorkflowStep.Sbt(