Cleaned up CI workflows

ethauvin · Jul 13, 2024 · 413fa71 · 413fa71
1 parent da0af85
commit 413fa71
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,21 +1,23 @@
-version: 2
+version: 2.1
+
+orbs:
+  sdkman: joshdholtz/sdkman@0.2.0
+
 defaults: &defaults
   working_directory: ~/repo
   environment:
     JVM_OPTS: -Xmx3200m
     TERM: dumb
     CI_NAME: "CircleCI"
 
-orbs:
-  sdkman: joshdholtz/sdkman@0.2.0
-
 defaults_bld: &defaults_bld
   steps:
     - checkout
     - sdkman/setup-sdkman
     - sdkman/sdkman-install:
         candidate: kotlin
         version: 2.0.0
+
     - run:
         name: Download the bld dependencies
         command: ./bld download

diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml
@@ -2,15 +2,14 @@ name: bld-ci
 
 on: [push, pull_request, workflow_dispatch]
 
-env:
-  KOTLIN_HOME: /usr/share/kotlinc
-
 jobs:
   build-bld-project:
     runs-on: ubuntu-latest
 
     env:
-      COVERAGE_SDK: "17"
+      COVERAGE_JDK: "22"
+      COVERAGE_KOTLIN: "2.0.0"
+      KOTLIN_HOME: /usr/share/kotlinc
 
     strategy:
       matrix:
@@ -42,12 +41,12 @@ jobs:
         run: ./bld jacoco
 
       - name: Remove pom.xml
-        if: success() && matrix.java-version == env.COVERAGE_SDK
+        if: success() && matrix.java-version == env.COVERAGE_JDK && matrix.kotlin-version == env.COVERAGE_KOTLIN
         run: rm -rf pom.xml
 
       - name: SonarCloud Scan
         uses: sonarsource/sonarcloud-github-action@master
-        if: success() && matrix.java-version == env.COVERAGE_SDK
+        if: success() && matrix.java-version == env.COVERAGE_JDK && matrix.kotlin-version == env.COVERAGE_KOTLIN
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}