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

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 5f239f843c68242ed61b5c6a136a03ea6353a84e
Merge: f6f7ddc 9ab9433
Author: Stephen Mallette <stepm...@amazon.com>
AuthorDate: Wed Dec 22 11:30:36 2021 -0500

    Merge branch '3.4-dev' into 3.5-dev

 .github/workflows/build-test.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --cc .github/workflows/build-test.yml
index f3a93b0,ec0b2e3..59eb69c
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@@ -14,23 -14,9 +14,23 @@@ jobs
            distribution: 'temurin'
        - name: Build with Maven
          run: mvn clean install -DskipTests -Dci --batch-mode 
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
 -  java:
 -    name: mvn clean install
 +  java-jdk11:
 +    name: mvn clean install - jdk11
-     timeout-minutes: 2700 # 45 minutes
++    timeout-minutes: 45
 +    needs: smoke
 +    runs-on: ubuntu-latest
 +    steps:
 +      - uses: actions/checkout@v2
 +      - name: Set up JDK 11
 +        uses: actions/setup-java@v2
 +        with:
 +          java-version: '11'
 +          distribution: 'adopt'
 +      - name: Build with Maven
 +        run: mvn clean install -pl -:gremlin-javascript -Dci --batch-mode 
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
 +  java-jdk8:
 +    name: mvn clean install - jdk8
-     timeout-minutes: 2700 # 45 minutes
+     timeout-minutes: 45
      needs: smoke
      runs-on: ubuntu-latest
      steps:
@@@ -42,9 -28,9 +42,9 @@@
            distribution: 'temurin'
        - name: Build with Maven
          run: mvn clean install -pl -:gremlin-javascript -Dci --batch-mode 
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
 -  gremlin-server:
 -    name: gremlin-server
 +  gremlin-server-default:
 +    name: gremlin-server default
-     timeout-minutes: 2700 # 45 minutes
+     timeout-minutes: 45
      needs: smoke
      runs-on: ubuntu-latest
      steps:
@@@ -56,27 -42,11 +56,27 @@@
            distribution: 'temurin'
        - name: Build with Maven
          run: |
 -          mvn clean install -pl 
-:gremlin-javascript,-:gremlin-python,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests
 -q -DskipTests -Dci
 +          mvn clean install -pl 
-:gremlin-javascript,-:gremlin-python,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests,-:gremlint
 -q -DskipTests -Dci
            mvn verify -pl :gremlin-server -DskipTests 
-DskipIntegrationTests=false -DincludeNeo4j
 +  gremlin-server-unified:
 +    name: gremlin-server unified
-     timeout-minutes: 2700 # 45 minutes
++    timeout-minutes: 45
 +    needs: smoke
 +    runs-on: ubuntu-latest
 +    steps:
 +      - uses: actions/checkout@v2
 +      - name: Set up JDK 11
 +        uses: actions/setup-java@v2
 +        with:
 +          java-version: '11'
 +          distribution: 'temurin'
 +      - name: Build with Maven
 +        run: |
 +          mvn clean install -pl 
-:gremlin-javascript,-:gremlin-python,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests,-:gremlint
 -q -DskipTests -Dci
 +          mvn verify -pl :gremlin-server -DskipTests 
-DskipIntegrationTests=false -DincludeNeo4j -DtestUnified=true
    spark-core:
      name: spark core
-     timeout-minutes: 2700 # 45 minutes
+     timeout-minutes: 45
      needs: smoke
      runs-on: ubuntu-latest
      steps:
@@@ -137,10 -107,10 +137,10 @@@
        - name: Build with Maven
          run: |
            mvn clean install -pl 
-:gremlin-python,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests 
-q -DskipTests -Dci
 -          mvn verify -pl :gremlin-javascript
 +          mvn verify -pl :gremlin-javascript,:gremlint -DincludeNeo4j
    python:
      name: python
-     timeout-minutes: 1200 # 20 minutes
+     timeout-minutes: 20
      needs: smoke
      runs-on: ubuntu-latest
      steps:
@@@ -162,11 -135,11 +162,11 @@@
        - name: Build with Maven
          run: |
            touch gremlin-python/.glv
 -          mvn clean install -pl 
-:gremlin-javascript,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests
 -DskipTests
 -          mvn verify -pl gremlin-python
 +          mvn clean install -pl 
-:gremlin-javascript,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests,-:gremlint
 -q -DskipTests -Dci
 +          mvn verify -pl gremlin-python -DincludeNeo4j
    dotnet:
      name: .NET
-     timeout-minutes: 1200 # 20 minutes
+     timeout-minutes: 20
      needs: smoke
      runs-on: ubuntu-latest
      steps:
@@@ -184,11 -157,11 +184,11 @@@
          run: |
            touch gremlin-dotnet/src/.glv
            touch gremlin-dotnet/test/.glv
 -          mvn clean install -pl -:gremlin-javascript,-:gremlin-python -q 
-DskipTests -Dci
 -          mvn verify -pl :gremlin-dotnet,:gremlin-dotnet-tests -P 
gremlin-dotnet
 +          mvn clean install -pl 
-:gremlin-javascript,-:gremlin-python,-:gremlint -q -DskipTests -Dci
 +          mvn verify -pl :gremlin-dotnet,:gremlin-dotnet-tests -P 
gremlin-dotnet -DincludeNeo4j
    neo4j-gremlin:
      name: neo4j-gremlin
-     timeout-minutes: 1200 # 20 minutes
+     timeout-minutes: 20
      needs: smoke
      runs-on: ubuntu-latest
      steps:

Reply via email to