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 14:14:02 UTC
[tinkerpop] branch ci-fix updated (82445c088e -> d1ff8f7690)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch ci-fix
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
discard 82445c088e f
discard 005a5c541e f
discard f30c71a0a3 f
discard 2dcc5ddb09 f
discard f8a64860d8 Restructure gremlin-go build to use maven
new d1ff8f7690 Restructure gremlin-go build to use maven
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (82445c088e)
\
N -- N -- N refs/heads/ci-fix (d1ff8f7690)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
[tinkerpop] 01/01: Restructure gremlin-go build to use maven
Posted by sp...@apache.org.
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 d1ff8f76901dfadea21848c4d62e8278bd0861d1
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 | 22 ++++++++++------------
gremlin-go/pom.xml | 30 ++++--------------------------
2 files changed, 14 insertions(+), 38 deletions(-)
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 19df57984f..807eee1c03 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:
@@ -229,29 +229,27 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v3
-
- name: Setup Go
uses: actions/setup-go@v3
with:
go-version: '1.17'
-
- 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
+ mvn clean install -DskipTests -DskipIntegrationTests=true -am
+ mvn install -Pdocker-images -pl :gremlin-server -DskipTests
+ - name: Build with Maven
+ working-directory: .
run: |
- chmod +x ./run.sh
- ./run.sh
- shell: bash
-
+ ls -la ./gremlin-go
+ touch ./gremlin-go/.glv
+ chmod +x ./gremlin-go/run.sh
+ ls -la ./gremlin-go
+ mvn verify -pl :gremlin-go
- name: Upload to Codecov
uses: codecov/codecov-action@v3
with:
working-directory: ./gremlin-go
-
- name: Go-Vet
working-directory: ./gremlin-go
run: go vet ./...
diff --git a/gremlin-go/pom.xml b/gremlin-go/pom.xml
index 0ec6b52a9e..17480f51ee 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>