From 4537d2d5fa126e4c71cd29e3551edd20b016b967 Mon Sep 17 00:00:00 2001
From: Joel Rebello <jrebello@packet.com>
Date: Tue, 26 Jul 2022 11:40:36 +0200
Subject: [PATCH] ci: update mergify, ci config

---
 .github/mergify.yml       | 9 ++++-----
 .github/workflows/ci.yaml | 2 --
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index df044fbf..e338173e 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,4 +1,4 @@
-queue_rules:
+queue_rule:
   - name: default
     conditions:
       # Conditions to get out of the queue (= merged)
@@ -8,11 +8,11 @@ queue_rules:
 pull_request_rules:
   - name: Automatic merge on approval
     conditions:
-      - base=master
+      - base=v2
       - "#approved-reviews-by>=1"
       - "#changes-requested-reviews-by=0"
-      - check-success=lint
-      - check-success=test
+      - check-success='lint'
+      - check-success='test'
       - label!=do-not-merge
       - label=ready-to-merge
     actions:
@@ -21,4 +21,3 @@ pull_request_rules:
         name: default
         commit_message_template: |
           {{ title }} (#{{ number }})
-
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 44145ecf..adbd8ad8 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -20,8 +20,6 @@ jobs:
       with:
         args: -v --config .golangci.yml --timeout=5m
         version: latest
-    - name: goimports-check
-      run: go get golang.org/x/tools/cmd/goimports && make goimports-check
     - name: make all-checks
       run: make all-checks
   test: