Skip to content

Commit

Permalink
Shorten number of excludes; Shorten ci.yml
Browse files Browse the repository at this point in the history
Signed-off-by: Pawel Gudel <[email protected]>
  • Loading branch information
pawel-gudel-eliatra committed Jun 23, 2023
1 parent ae391e6 commit 77cf616
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 60 deletions.
60 changes: 1 addition & 59 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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(["citest"] + taskNames))
}
}

Expand Down

0 comments on commit 77cf616

Please sign in to comment.