Better CI: no integrationtest in master push, full tests in PR

josemduarte · josemduarte · commit e9033c81ee8f · 2021-10-29T20:56:12.000-07:00
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -1,6 +1,9 @@
 name: Master Build
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
 
 jobs:
   test:
@@ -21,5 +24,5 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: ${{ matrix.java }}
-      - name: Test with Maven
-        run: mvn verify
+      - name: Build and test, no integration tests
+        run: mvn verify -pl '!biojava-integrationtest'
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -0,0 +1,31 @@
+name: PR Build
+
+on: 
+  push:
+    branches:
+      - '!master'
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        # We do one OS only to reduce resource utilization. To do macOS to this would be needed:
+        #os: [ubuntu-20.04, macOS-latest]
+        os: [ubuntu-latest]
+        java: [11]
+      fail-fast: false
+      max-parallel: 4
+    name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+      - name: Build, test and integration test
+        run: mvn verify
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Welcome to <img src="logo-full.png" height="35"/>
 
-![Build](https://github.com/biojava/biojava/actions/workflows/ci.yaml/badge.svg)
+![Build](https://github.com/biojava/biojava/actions/workflows/master.yml/badge.svg)
 [![Version](http://img.shields.io/badge/version-6.0.0-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-6.0.0) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 
