Merge pull request #273 from groovy/ci-cleanup

Minor cleanup in CI config
groovy · Sep 26, 2023 · b5bc559 · b5bc559
2 parents 241255e + f6d9ec5
commit b5bc559
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -11,12 +11,11 @@ on:
 env:
   MAVEN_OPTS: '-Xms2048m -Xmx2048m'
   MAVEN_ARGS: >-
-    --show-version 
-    --errors 
-    --batch-mode 
-    --no-transfer-progress 
-    -Dinvoker.streamLogsOnFailures=true 
-    -Pnonindy
+    --show-version
+    --errors
+    --batch-mode
+    --no-transfer-progress
+    -Dinvoker.streamLogsOnFailures=true
 
 defaults:
   run:
@@ -34,7 +33,7 @@ jobs:
           - 5.0.0-alpha-2
     env:
       MVN_GROOVY_GROUP_ID: ${{format('{0}{1}', '-DgroovyVersion=', matrix.groovy-version)}}
-      MVN_GROOVY_VERSION: ${{(startsWith(matrix.groovy-version, '2') || startsWith(matrix.groovy-version, '3')) && '-DgroovyGroupId=org.codehaus.groovy' || '-DgroovyGroupId=org.apache.groovy' }}
+      MVN_GROOVY_VERSION: ${{(startsWith(matrix.groovy-version, '2') || startsWith(matrix.groovy-version, '3')) && '-DgroovyGroupId=org.codehaus.groovy' || '-DgroovyGroupId=org.apache.groovy'}}
     steps:
       - name: checkout
         uses: actions/checkout@v4
@@ -45,7 +44,5 @@ jobs:
           java-version: 17
       - name: full test
         run: >-
-          ./mvnw ${MAVEN_ARGS}
-          ${MVN_GROOVY_GROUP_ID}
-          ${MVN_GROOVY_VERSION}          
+          ./mvnw ${MAVEN_ARGS} ${MVN_GROOVY_GROUP_ID} ${MVN_GROOVY_VERSION}
           clean install invoker:install invoker:run