Merge branch '3.5-dev'

spmallette · spmallette · commit 414684eec968 · 2022-04-01T19:28:18.000-04:00
diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh
@@ -67,7 +67,7 @@ if [ -d "${TINKERMEM_PATH}" ]; then
   cd ${TINKERMEM_PATH}
 fi
 
-touch {gremlin-dotnet,gremlin-dotnet/src,gremlin-dotnet/test,gremlin-python,gremlin-javascript}/.glv
+touch {gremlin-dotnet,gremlin-go,gremlin-dotnet/src,gremlin-dotnet/test,gremlin-python,gremlin-javascript}/.glv
 
 # use a custom maven settings.xml
 if [ -r "settings.xml" ]; then
diff --git a/gremlin-go/pom.xml b/gremlin-go/pom.xml
@@ -94,6 +94,10 @@ limitations under the License.
                                     <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>
@@ -137,6 +141,10 @@ limitations under the License.
                                 <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>
