Cleaned up CI workflows

ethauvin · Jul 15, 2024 · e9850d6 · e9850d6
1 parent ec2fd6d
commit e9850d6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -12,21 +12,29 @@ defaults: &defaults
 
 commands:
   build_and_test:
+    parameters:
+      reports-dir:
+        type: string
+        default: "build/reports/test_results"
     steps:
       - checkout
       - sdkman/setup-sdkman
       - sdkman/sdkman-install:
           candidate: kotlin
           version: 2.0.0
       - run:
-          name: Download the dependencies
+          name: Download dependencies
           command: ./bld download
       - run:
           name: Compile source
           command: ./bld compile
       - run:
           name: Run tests
-          command: ./bld test
+          command: ./bld jacoco -reports-dir=<< parameters.reports-dir >>
+      - store_test_results:
+          path: << parameters.reports-dir >>
+      - store_artifacts:
+          path: build/reports/jacoco/test/html
 
 jobs:
   bld_jdk17:

diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml
@@ -22,25 +22,24 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up JDK ${{ matrix.java-version }}
+      - name: Set up JDK ${{ matrix.java-version }} with Kotlin ${{ matrix.kotlin-version }}
         uses: actions/setup-java@v4
         with:
           distribution: "zulu"
           java-version: ${{ matrix.java-version }}
 
-      - name: Grant bld execute permission
-        run: chmod +x bld
-
-      - name: Download the bld dependencies
+      - name: Download dependencies
         run: ./bld download
 
-      - name: Compile source with bld
+      - name: Compile source
         run: ./bld compile
 
-      - name: Run tests with bld
+
+      - name: Run tests
         run: ./bld jacoco
 
       - name: Remove pom.xml
+        if: success() && matrix.java-version == env.COVERAGE_JDK && matrix.kotlin-version == env.COVERAGE_KOTLIN
         run: rm -rf pom.xml
 
       - name: SonarCloud Scan