From 49b0dddbf0852af71f30d3eb1c0ca279b6d81649 Mon Sep 17 00:00:00 2001
From: Pawel Gudel <pawel.gudel@eliatra.com>
Date: Fri, 23 Jun 2023 23:59:28 +0200
Subject: [PATCH] Shorten number of excludes; Shorten ci.yml

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e8d8a09632..ea11bf84c1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,57 +29,6 @@ jobs:
   build:
     name: build
     needs: generate-test-list
-    strategy:
-      fail-fast: false
-      matrix:
-        jdk: [11, 17]
-        platform: ["ubuntu-latest", "windows-latest"]
-    runs-on: ${{ matrix.platform }}
-
-    steps:
-    - name: Set up JDK for build and test
-      uses: actions/setup-java@v2
-      with:
-        distribution: temurin # Temurin is a distribution of adoptium
-        java-version: ${{ matrix.jdk }}
-
-    - name: Checkout security
-      uses: actions/checkout@v2
-
-    - name: Build and Test
-      uses: gradle/gradle-build-action@v2
-      with:
-        arguments: |
-          build citest -Dbuild.snapshot=false
-          -x integrationTest
-          -x spotlessCheck
-          -x checkstyleMain
-          -x checkstyleTest
-          -x spotbugsMain
-          -x spotbugsIntegrationTest
-          -x checkstyleIntegrationTest
-          -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"
-
-  build-test:
-    name: build-test
-    needs: generate-test-list
     strategy:
       fail-fast: false
       matrix:
@@ -102,14 +51,7 @@ jobs:
       uses: gradle/gradle-build-action@v2
       with:
         arguments: |
-          build ${{ matrix.gradle_task }} -Dbuild.snapshot=false
-          -x integrationTest
-          -x spotlessCheck
-          -x checkstyleMain
-          -x checkstyleTest
-          -x spotbugsMain
-          -x spotbugsIntegrationTest
-          -x checkstyleIntegrationTest
+          ${{ matrix.gradle_task }} -Dbuild.snapshot=false
           -x test
 
     - name: Coverage
diff --git a/build.gradle b/build.gradle
index 2f71fb3564..eca53d4f74 100644
--- a/build.gradle
+++ b/build.gradle
@@ -174,7 +174,7 @@ List<String> taskNames = splitTestConfig.keySet() as List
 
 task listTasksAsJSON {
     doLast {
-        System.out.println(new JsonBuilder(taskNames))
+        System.out.println(new JsonBuilder(taskNames + "citest"))
     }
 }