diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index cfed82f..58ed9da 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -1,13 +1,43 @@ name: bld-ci -on: [ push, pull_request, workflow_dispatch ] +on: [push, pull_request, workflow_dispatch] jobs: build-bld-project: strategy: matrix: - java-version: [ 17, 21, 24 ] - kotlin-version: [ 1.9.25, 2.0.21, 2.1.20 ] + java-version: [17, 21, 24] + kotlin-version: [1.9.25, 2.0.21, 2.1.20] + + runs-on: ubuntu-latest + + steps: + - name: Checkout source repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Set up JDK ${{ matrix.java-version }} + uses: actions/setup-java@v4 + with: + distribution: "zulu" + java-version: ${{ matrix.java-version }} + + - name: Download dependencies [examples] + working-directory: examples + run: ./bld download + + - name: Download dependencies + run: ./bld download + + - name: Run tests + run: ./bld compile test + + build-bld-examples: + strategy: + matrix: + java-version: [17, 21, 24] + kotlin-version: [1.9.25, 2.0.21, 2.1.20] os: [ ubuntu-latest, windows-latest, macos-latest ] runs-on: ${{ matrix.os }} @@ -30,10 +60,4 @@ jobs: - name: Run tests [examples] working-directory: examples - run: ./bld compile test - - - name: Download dependencies - run: ./bld download - - - name: Run tests run: ./bld compile test \ No newline at end of file diff --git a/src/bld/java/rife/bld/extension/CompileKotlinOperationBuild.java b/src/bld/java/rife/bld/extension/CompileKotlinOperationBuild.java index d4830fd..a3adce1 100644 --- a/src/bld/java/rife/bld/extension/CompileKotlinOperationBuild.java +++ b/src/bld/java/rife/bld/extension/CompileKotlinOperationBuild.java @@ -23,7 +23,6 @@ import rife.bld.publish.PublishLicense; import rife.bld.publish.PublishScm; import java.util.List; -import java.util.Locale; import static rife.bld.dependencies.Repository.*; import static rife.bld.dependencies.Scope.compile; @@ -98,13 +97,10 @@ public class CompileKotlinOperationBuild extends Project { @Override public void test() throws Exception { - var os = System.getProperty("os.name"); - if (os != null && os.toLowerCase(Locale.US).contains("linux")) { - new ExecOperation() - .fromProject(this) - .command("scripts/cliargs.sh") - .execute(); - } + new ExecOperation() + .fromProject(this) + .command("scripts/cliargs.sh") + .execute(); super.test(); } } diff --git a/src/main/java/rife/bld/extension/CompileKotlinOperation.java b/src/main/java/rife/bld/extension/CompileKotlinOperation.java index 26437a8..0ee06d8 100644 --- a/src/main/java/rife/bld/extension/CompileKotlinOperation.java +++ b/src/main/java/rife/bld/extension/CompileKotlinOperation.java @@ -42,7 +42,7 @@ public class CompileKotlinOperation extends AbstractOperation compileMainClasspath_ = new ArrayList<>(); private final Collection compileTestClasspath_ = new ArrayList<>(); private final JvmOptions jvmOptions_ = new JvmOptions(); @@ -191,17 +191,6 @@ public class CompileKotlinOperation extends AbstractOperation