From d93ff362bda6fd0b01d9df64d78475622b8a7c5f Mon Sep 17 00:00:00 2001
From: AntsyLich <59261191+AntsyLich@users.noreply.github.com>
Date: Tue, 30 Apr 2024 18:58:56 +0600
Subject: [PATCH] Merge build workflow files (#11)

---
 .../{build_pull_request.yml => build.yml}     | 15 ++++++---
 .github/workflows/build_push.yml              | 31 -------------------
 2 files changed, 10 insertions(+), 36 deletions(-)
 rename .github/workflows/{build_pull_request.yml => build.yml} (76%)
 delete mode 100644 .github/workflows/build_push.yml

diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build.yml
similarity index 76%
rename from .github/workflows/build_pull_request.yml
rename to .github/workflows/build.yml
index 3b5c392..7b52cf4 100644
--- a/.github/workflows/build_pull_request.yml
+++ b/.github/workflows/build.yml
@@ -1,9 +1,14 @@
-name: PR build check
+name: Build check
 on:
-  pull_request
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -18,8 +23,8 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
-            java-version: 17
-            distribution: adopt
+          java-version: 17
+          distribution: adopt
 
       - name: Set up gradle
         uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml
deleted file mode 100644
index b867122..0000000
--- a/.github/workflows/build_push.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: Push build check
-
-on:
-  push:
-    branches:
-        - main
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
-
-      - name: Set up JDK
-        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
-        with:
-            java-version: 17
-            distribution: adopt
-
-      - name: Set up gradle
-        uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
-
-      - name: Build
-        run: ./gradlew build