From d93ed57ed3e4a2224e8fc0bc54bb08fce6a19cad Mon Sep 17 00:00:00 2001
From: Pawel Gudel <pawel.gudel@eliatra.com>
Date: Wed, 28 Jun 2023 01:33:19 +0200
Subject: [PATCH] Restored unified list of Gradle task.. again!

Signed-off-by: Pawel Gudel <pawel.gudel@eliatra.com>
---
 .github/workflows/ci.yml | 45 +---------------------------------------
 build.gradle             |  2 +-
 2 files changed, 2 insertions(+), 45 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f06c7457bf..594b08c0c2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,49 +25,6 @@ jobs:
       run: |
         echo "separateTestsNames=$(./gradlew listTasksAsJSON -q --console=plain | tail -n 1)" >> $GITHUB_OUTPUT
 
-  tests:
-    name: tests
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [windows-latest, ubuntu-latest]
-        jdk: [11, 17]
-    runs-on: ${{ matrix.platform }}
-
-    steps:
-    - name: Set up JDK for build and test
-      uses: actions/setup-java@v2
-      with:
-        distribution: temurin
-        java-version: ${{ matrix.jdk }}
-
-    - name: Checkout security
-      uses: actions/checkout@v2
-
-    - name: Build and Test
-      uses: gradle/gradle-build-action@v2
-      with:
-        arguments: |
-          citest -Dbuild.snapshot=false
-          -x test
-
-    - name: Coverage
-      uses: codecov/codecov-action@v1
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        files: ./build/reports/jacoco/test/jacocoTestReport.xml
-
-    - uses: actions/upload-artifact@v3
-      if: always()
-      with:
-        name: ${{ matrix.platform }}-JDK${{ matrix.jdk }}-reports
-        path: |
-          ./build/reports/
-
-    - name: check archive for debugging
-      if: always()
-      run: echo "Check the artifact ${{ matrix.platform }}-JDK${{ matrix.jdk }}-reports for detailed test results"
-
   test:
     name: test
     needs: generate-test-list
@@ -75,8 +32,8 @@ jobs:
       fail-fast: false
       matrix:
         gradle_task: ${{ fromJson(needs.generate-test-list.outputs.separateTestsNames) }}
-        jdk: [11, 17]
         platform: [windows-latest, ubuntu-latest]
+        jdk: [11, 17]
     runs-on: ${{ matrix.platform }}
 
     steps:
diff --git a/build.gradle b/build.gradle
index e62255f2c8..73c6963e43 100644
--- a/build.gradle
+++ b/build.gradle
@@ -177,7 +177,7 @@ task listTasksAsJSON {
     // want this action to be started. Without it the output
     // is not shown at all or can be mixed with other outputs.
     doLast {
-        System.out.println(new JsonBuilder(taskNames))
+        System.out.println(new JsonBuilder(["citest"] + taskNames))
     }
 }