From e9734bd3d1b0fff9a062528afc371c6209d2bebd Mon Sep 17 00:00:00 2001
From: hogaur <hogaur@gmail.com>
Date: Mon, 8 Feb 2021 22:34:54 +0530
Subject: [PATCH] Merges with build.yml

---
 .github/workflows/build.yml |  1 +
 .github/workflows/ci.yml    | 94 -------------------------------------
 2 files changed, 1 insertion(+), 94 deletions(-)
 delete mode 100644 .github/workflows/ci.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 39005d77..51c11b85 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,6 +2,7 @@ name: Ziggurat CI
 
 on:
   push:
+    pull_request:
     branches:
     tags:
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
deleted file mode 100644
index 4dde28e7..00000000
--- a/.github/workflows/ci.yml
+++ /dev/null
@@ -1,94 +0,0 @@
-name: Ziggurat CI
-
-on:
-  push:
-    pull_requests:
-
-jobs:
-  lint_check:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/setup-java@v1
-        with:
-          java-version: '1.8'
-      - uses: DeLaGuardo/setup-clojure@master
-        with:
-          lein: '2.8.1'
-      - uses: actions/checkout@v2
-
-      - name: Lint Checks
-        run: lein cljfmt check
-
-      - name: Lein Kibit Check
-        run: lein kibit
-
-  run_tests_with_kafka_1:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/setup-java@v1
-        with:
-          java-version: '1.8'
-      - uses: DeLaGuardo/setup-clojure@master
-        with:
-          lein: '2.8.1'
-      - uses: actions/checkout@v2
-
-      - name: Run Tests on Kafka 1.x
-        run: ./bin/run_tests_in_ci.sh
-        env:
-          KAFKA_VERSION: 1
-
-  run_tests_with_kafka_2:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/setup-java@v1
-        with:
-          java-version: '1.8'
-      - uses: DeLaGuardo/setup-clojure@master
-        with:
-          lein: '2.8.1'
-      - uses: actions/checkout@v2
-
-      - name: Run Tests on Kafka 2.x
-        run: ./bin/run_tests_in_ci.sh
-        env:
-          KAFKA_VERSION: 2
-
-  calculate_coverage:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/setup-java@v1
-        with:
-          java-version: '1.8'
-      - uses: DeLaGuardo/setup-clojure@master
-        with:
-          lein: '2.8.1'
-      - uses: actions/checkout@v2
-
-      - name: Calculate Coverage
-        run: make coverage
-
-      - name: Coveralls
-        uses: coverallsapp/github-action@master
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-
-  deploy_to_clojars:
-    runs-on: ubuntu-latest
-    needs: [lint_check, run_tests_with_kafka_1, run_tests_with_kafka_2, calculate_coverage]
-    if: ${{ startsWith(github.ref, 'refs/tags/') }}
-    env:
-      CLOJARS_USERNAME: ${{ secrets.CLOJARS_USERNAME }}
-      CLOJARS_PASSWORD: ${{ secrets.CLOJARS_PASSWORD }}
-    steps:
-      - uses: actions/setup-java@v1
-        with:
-          java-version: '1.8'
-      - uses: DeLaGuardo/setup-clojure@master
-        with:
-          lein: '2.8.1'
-      - uses: actions/checkout@v2
-
-      - name: Deploy to Clojars
-        run: lein deploy clojars