This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit d28ed21353c2b10f03fe45ea5e51d8fc8944fa0f
Merge: 382054d b3d516d
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Wed Aug 5 15:00:48 2020 -0400

    Merge branch '1.9' into main

 .github/workflows/maven.yaml | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --cc .github/workflows/maven.yaml
index dd78a36,21cf1f8..01b2acb
--- a/.github/workflows/maven.yaml
+++ b/.github/workflows/maven.yaml
@@@ -24,19 -24,19 +24,20 @@@ name: Q
  
  on:
    push:
-     branches: [ 2.1, main ]
 -    branches: [ '1.*' ]
++    branches: [ main, '2.*' ]
    pull_request:
-     branches: [ 2.1, main ]
 -    branches: [ '1.*' ]
++    branches: [ main, '2.*' ]
  
  jobs:
-   build:
+   mvn:
      strategy:
        matrix:
          profile:
-           - {name: 'verify', args: 'verify javadoc:jar -DskipITs'}
-           - {name: 'sec-bugs', args: 'verify -PskipQA,sec-bugs 
-Dspotbugs.skip=false -Dspotbugs.timeout=3600000'}
-           - {name: 'hadoop-3.0.3', args: 'package -DskipTests 
-Dhadoop.version=3.0.3'}
 -          - {name: 'Hadoop 2 (default)', args: 'verify javadoc:jar -DskipITs 
-DforkCount=1C'}
 -          - {name: 'Hadoop 3',           args: 'verify javadoc:jar -DskipITs 
-DforkCount=1C -Dhadoop.profile=3'}
++          - {name: 'unit-tests',    args: 'verify -PskipQA -DskipTests=false 
-DforkCount=1C'}
++          - {name: 'qa-checks',     args: 'verify javadoc:jar -Psec-bugs 
-DskipTests=true -Dspotbugs.timeout=3600000'}
++          - {name: 'hadoop-compat', args: 'package -DskipTests 
-Dhadoop.version=3.0.3'}
        fail-fast: false
+     timeout-minutes: 60
      runs-on: ubuntu-latest
      steps:
      - uses: actions/checkout@v2

Reply via email to