Merge pull request #31 from aservo/feature/improve-workflow

Unify workflows for main push and pull requests
aservo · Oct 24, 2023 · d525f6b · d525f6b
2 parents 6830fad + 4eab086
commit d525f6b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 117 deletions.
diff --git a/.github/workflows/ci_main.yaml → .github/workflows/ci.yaml b/.github/workflows/ci_main.yaml → .github/workflows/ci.yaml
@@ -1,9 +1,12 @@
-name: CI Main
+name: CI
 
 on:
   push:
     branches:
       - 'main'
+  pull_request:
+    branches:
+      - 'main'
 
 jobs:
   package:
@@ -87,6 +90,8 @@ jobs:
   deploy:
     needs: [unit-tests, integration-tests]
 
+    if: github.event_name == 'push' # to 'main'
+
     runs-on: ubuntu-20.04
 
     env:
@@ -124,7 +129,7 @@ jobs:
       run: export GPG_TTY=$(tty) && ./mvnw -s .github/workflows/settings.xml -DskipTests deploy -B
 
   apcc:
-    needs: deploy
+    needs: package
 
     runs-on: ubuntu-20.04
 

diff --git a/.github/workflows/ci_pull_request.yaml b/.github/workflows/ci_pull_request.yaml