From 63cd7a3273615575d57dd76c4db5546597037b3a Mon Sep 17 00:00:00 2001
From: Evgeny Danienko <6655321@bk.ru>
Date: Wed, 11 May 2022 10:33:44 +0300
Subject: [PATCH] move integration ci

---
 .github/workflows/ci.yml               |  5 +++-
 .github/workflows/test-integration.yml | 39 --------------------------
 2 files changed, 4 insertions(+), 40 deletions(-)
 delete mode 100644 .github/workflows/test-integration.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6ba2cece0b..36fdc12f86 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -60,4 +60,7 @@ jobs:
           run: make test
 
         - name: Data race tests
-          run: make test-race
\ No newline at end of file
+          run: make test-race
+
+        - name: test-integration
+          run: make test-integration 
\ No newline at end of file
diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
deleted file mode 100644
index 93578062f2..0000000000
--- a/.github/workflows/test-integration.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-name: Integration tests
-on:
-  push:
-    branches:
-      - "**"
-      - "!master"
-  pull_request:
-    branches:
-      - master
-    types: [opened, synchronize, closed]
-jobs:
-  tests:
-    if: (!(github.event.action == 'closed' && github.event.pull_request.merged != true))
-    strategy:
-      matrix:
-        os: [ ubuntu-20.04, macos-11 ] # list of os: https://github.com/actions/virtual-environments
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - uses: actions/checkout@v3
-      - run: git submodule update --init --recursive --force
-      - uses: actions/setup-go@v3
-        with:
-          go-version: 1.18.x
-      - name: Install dependencies on Linux
-        if: runner.os == 'Linux'
-        run: sudo apt update && sudo apt install build-essential
-
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/Library/Caches/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: ${{ runner.os }}-go-
-
-      - name: test-integration
-        run: make test-integration