Merge build workflow files (#11)

mihonapp · Apr 30, 2024 · d93ff36 · d93ff36
1 parent 4df9ded
commit d93ff36
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 36 deletions.
diff --git a/.github/workflows/build_pull_request.yml → .github/workflows/build.yml b/.github/workflows/build_pull_request.yml → .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