You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2022/07/12 11:19:03 UTC

[tinkerpop] 01/01: Restructure gremlin-go build to use maven

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

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

commit f8a64860d892f3003430645b048646bb7907fde1
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Tue Jul 12 07:18:35 2022 -0400

    Restructure gremlin-go build to use maven
---
 .github/workflows/build-test.yml | 13 +++++--------
 gremlin-go/pom.xml               | 30 ++++--------------------------
 2 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 19df57984f..278643a531 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -25,7 +25,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           java-version: '11'
-          distribution: 'adopt'
+          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
   java-jdk8:
@@ -238,14 +238,11 @@ jobs:
       - name: Generate Gremlin Server Base Image
         working-directory: .
         run: |
-          mvn clean install -pl :gremlin-server -DskipTests -DskipIntegrationTests=true -am && mvn install -Pdocker-images -pl :gremlin-server
-
-      - name: Execute Go tests
-        working-directory: ./gremlin-go
-        run: |
+          touch gremlin-python/.glv
           chmod +x ./run.sh
-          ./run.sh
-        shell: bash
+          mvn clean install -DskipTests -DskipIntegrationTests=true -am
+          mvn install -Pdocker-images -pl :gremlin-server
+          mvn verify -pl :gremlin-go
 
       - name: Upload to Codecov
         uses: codecov/codecov-action@v3
diff --git a/gremlin-go/pom.xml b/gremlin-go/pom.xml
index 0ec6b52a9e..885a7d1f65 100644
--- a/gremlin-go/pom.xml
+++ b/gremlin-go/pom.xml
@@ -88,36 +88,14 @@ limitations under the License.
                         <version>1.2.1</version>
                         <executions>
                             <execution>
-                                <id>run integration tests</id>
-                                <phase>verify</phase>
+                                <id>run-tests</id>
+                                <phase>integration-test</phase>
                                 <goals>
                                     <goal>exec</goal>
                                 </goals>
                                 <configuration>
-                                    <!-- tests pass, but there is some trouble running these in docker/build.sh
-                                         as docker-compose isn't a command available in that image. skipping until
-                                         resolved -->
-                                    <skip>true</skip>
-                                    <executable>docker-compose</executable>
-                                    <arguments>
-                                        <argument>up</argument>
-                                        <argument>--exit-code-from</argument>
-                                        <argument>gremlin-go-integration-tests</argument>
-                                    </arguments>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>shutdown container</id>
-                                <phase>verify</phase>
-                                <configuration>
-                                    <!-- tests pass, but there is some trouble running these in docker/build.sh
-                                         as docker-compose isn't a command available in that image. skipping until
-                                         resolved -->
-                                    <skip>true</skip>
-                                    <executable>docker-compose</executable>
-                                    <arguments>
-                                        <argument>down</argument>
-                                    </arguments>
+                                    <skip>${skipTests}</skip>
+                                    <executable>run.sh</executable>
                                 </configuration>
                             </execution>
                         </executions>