fix-maven-concurrency (#3479)

* fix-maven-concurrency * Update windows.yml * Update windows.yml * Update windows.yml * Update windows.yml * Update windows.yml * Update windows.yml * Update windows.yml * Update run-tests-python2.cmd * Update run-tests-python3.cmd * Update windows.yml * Update windows.yml * Update windows.yml * Update windows.yml * Update windows.yml * Update windows.yml * Update windows.yml * Update windows.yml * Update windows.yml * Update run-tests-php.cmd * Update windows.yml * Update run-tests-dart.cmd * Update run-tests-csharp.cmd * Update run-tests-go.cmd * Update run-tests-java.cmd * Update run-tests-javascript.cmd * Update run-tests-php.cmd * Update run-tests-python2.cmd * Update run-tests-python3.cmd
antlr · Jan 9, 2022 · 96c053c · 96c053c
1 parent 7d2a37e
commit 96c053c
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 19 deletions.
diff --git a/.github/scripts-windows/run-tests-csharp.cmd b/.github/scripts-windows/run-tests-csharp.cmd
@@ -1,5 +1,5 @@
 dotnet build runtime/CSharp/src/Antlr4.csproj -c Release
 dotnet pack runtime/CSharp/src/Antlr4.csproj -c Release
 cd runtime-testsuite
-mvn -Dparallel=classes -DthreadCount=4 -Dtest=csharp.** test
+mvn -Dtest=csharp.** test
 cd ..
diff --git a/.github/scripts-windows/run-tests-dart.cmd b/.github/scripts-windows/run-tests-dart.cmd
@@ -1,5 +1,5 @@
 C:\ProgramData\chocolatey\bin\choco.exe -y install dart-sdk
 
 cd runtime-testsuite
-mvn -Dparallel=classes -DthreadCount=4 -Dtest=dart.** test -Dantlr-dart-dart="C:\tools\dart-sdk\bin\dart.exe" -Dantlr-dart-pub="C:\tools\dart-sdk\bin\pub.bat" -Dantlr-dart-dart2native="C:\tools\dart-sdk\bin\dart2native.bat"
+mvn -Dtest=dart.** test -Dantlr-dart-dart="C:\tools\dart-sdk\bin\dart.exe" -Dantlr-dart-pub="C:\tools\dart-sdk\bin\pub.bat" -Dantlr-dart-dart2native="C:\tools\dart-sdk\bin\dart2native.bat"
 cd ..
diff --git a/.github/scripts-windows/run-tests-go.cmd b/.github/scripts-windows/run-tests-go.cmd
@@ -1,3 +1,3 @@
 cd runtime-testsuite
-mvn -Dparallel=classes -DthreadCount=4 -Dtest=go.** test
+mvn -Dtest=go.** test
 cd ..
diff --git a/.github/scripts-windows/run-tests-java.cmd b/.github/scripts-windows/run-tests-java.cmd
@@ -1,3 +1,3 @@
 cd runtime-testsuite
-mvn -Dparallel=classes -DthreadCount=4 -Dtest=java.** test
+mvn -Dtest=java.** test
 cd ..
diff --git a/.github/scripts-windows/run-tests-javascript.cmd b/.github/scripts-windows/run-tests-javascript.cmd
@@ -1,3 +1,3 @@
 cd runtime-testsuite
-mvn -Dparallel=classes -DthreadCount=4 -Dtest=javascript.** test 
+mvn -Dtest=javascript.** test 
 cd ..
diff --git a/.github/scripts-windows/run-tests-php.cmd b/.github/scripts-windows/run-tests-php.cmd
@@ -4,5 +4,5 @@ git clone https://github.com/antlr/antlr-php-runtime.git
 move antlr-php-runtime runtime\PHP
 
 cd runtime-testsuite
-mvn -Dparallel=classes -DthreadCount=4 -Dtest=php.** test -Dantlr-php-php="C:\tools\php\php.exe"
+mvn -Dtest=php.** test -Dantlr-php-php="C:\tools\php81\php.exe"
 cd ..
diff --git a/.github/scripts-windows/run-tests-python2.cmd b/.github/scripts-windows/run-tests-python2.cmd
@@ -1,3 +1,3 @@
 cd runtime-testsuite
-mvn -Dantlr-python2-python="C:\Program Files\Python27\python.exe" -Dparallel=classes -DthreadCount=4 -Dtest=python2.** test 
+mvn -Dantlr-python2-python="C:\Python27\python.exe" -Dtest=python2.** test 
 cd ..
diff --git a/.github/scripts-windows/run-tests-python3.cmd b/.github/scripts-windows/run-tests-python3.cmd
@@ -1,3 +1,3 @@
 cd runtime-testsuite
-mvn -Dantlr-python3-python="C:\Program Files\Python310\python.exe" -Dparallel=classes -DthreadCount=4 -Dtest=python3.** test 
+mvn -Dantlr-python3-python="C:\Python310\python.exe" -Dtest=python3.** test 
 cd ..
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -26,14 +26,14 @@ jobs:
         maven-version: 3.5.4    
 #     fails due to permissions, use global install
 #    - name: Set up Python 2
-#      if: ${{ matrix.TARGET }} == 'python2'
+#      if: matrix.TARGET == 'python2'
 #      uses: actions/setup-python@v2
 #      with:
 #        python-version: '2.x' 
 #        architecture: 'x64' 
 #     fails due to permissions, use global install
 #    - name: Set up Python 3
-#      if: ${{ matrix.TARGET }} == 'python3'
+#      if: matrix.TARGET == 'python3'
 #      uses: actions/setup-python@v2
 #      with:
 #        python-version: '3.x' 
@@ -43,11 +43,13 @@ jobs:
       uses: actions/setup-node@v2
       with:
         node-version: '14'
-    - name: Setup Dotnet 3.1
+    - name: Setup Dotnet 3.1 and 5.0
       if: matrix.TARGET == 'csharp'
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.x
+        dotnet-version: |
+          3.1.x
+          5.0.x
 #     fails due to os (Linux only), use global install
 #    - name: Setup Dart 2.12.1
 #      uses: dart-lang/setup-dart@v1
@@ -59,13 +61,14 @@ jobs:
       with:
         go-version: '^1.13.1' 
 # requires manually setting up pwsh
-    - name: Setup PHP 8.2
-      if: matrix.TARGET == 'php'
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: '8.2'
-        extensions: mbstring    
-        tools: composer
+# fails due to incorrect script (missing printf)
+#    - name: Setup PHP 8.2
+#      if: matrix.TARGET == 'php'
+#      uses: shivammathur/setup-php@v2
+#      with:
+#        php-version: '8.2'
+#        extensions: mbstring    
+#        tools: composer
     - name: Build tool with Maven
       run: mvn install -DskipTests=true -Darguments="-Dmaven.javadoc.skip=true" -B -V
     - name: Test with Maven