diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index 90e4234..d4d743a 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -4,15 +4,14 @@ on: [push, pull_request, workflow_dispatch] jobs: build-bld-project: + runs-on: ubuntu-latest + env: COVERAGE_JDK: "17" strategy: matrix: java-version: [17, 21, 24] - os: [ ubuntu-latest, windows-latest, macos-latest ] - - runs-on: ${{ matrix.os }} steps: - name: Checkout source repository @@ -26,30 +25,6 @@ jobs: distribution: "zulu" java-version: ${{ matrix.java-version }} - - name: Download dependencies [bld example] - working-directory: examples/java/bld - run: ./bld download - - - name: Compile and run [bld example] - working-directory: examples/java/bld - run: | - ./bld compile run - ./bld run-java - - - name: Run example [gradle java examples] - working-directory: examples/java/gradle - if: matrix.java-version != '24' - run: | - ./gradlew run - ./gradlew runJava - - - name: Run example [gradle kotlin examples] - working-directory: examples/kotlin - if: matrix.java-version != '24' - run: | - ./gradlew run - ./gradlew runJava - - name: Download dependencies run: ./bld download @@ -60,18 +35,18 @@ jobs: run: ./bld jacoco - name: Remove pom.xml - if: success() && matrix.java-version == env.COVERAGE_JDK && matrix.os == 'ubuntu-latest' + if: success() && matrix.java-version == env.COVERAGE_JDK run: rm -rf pom.xml - name: SonarCloud Scan uses: sonarsource/sonarcloud-github-action@master - if: success() && matrix.java-version == env.COVERAGE_JDK && matrix.os == 'ubuntu-latest' + if: success() && matrix.java-version == env.COVERAGE_JDK env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - name: Upload coverage reports to Codecov uses: codecov/codecov-action@v3 - if: success() && matrix.java-version == env.COVERAGE_JDK && matrix.os == 'ubuntu-latest' + if: success() && matrix.java-version == env.COVERAGE_JDK env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/examples/kotlin/build.gradle.kts b/examples/kotlin/build.gradle.kts index 2ea445a..db6ebb0 100644 --- a/examples/kotlin/build.gradle.kts +++ b/examples/kotlin/build.gradle.kts @@ -1,7 +1,7 @@ plugins { id("application") id("com.github.ben-manes.versions") version "0.51.0" - kotlin("jvm") version "2.1.20" + kotlin("jvm") version "2.1.10" kotlin("kapt") version "1.9.25" }