Compare commits

..

No commits in common. "1bc3dae1cac6a878830a274074499ac4edf79138" and "359e5995f51b67d12c73db0ca0c004f0de5df9ce" have entirely different histories.

3 changed files with 9 additions and 25 deletions

View file

@ -1,16 +1,14 @@
name: bld-ci name: bld-ci
on: [ push, pull_request, workflow_dispatch ] on: [push, pull_request, workflow_dispatch]
jobs: jobs:
build-bld-project: build-bld-project:
runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
java-version: [ 17, 21, 24 ] 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 }}
steps: steps:
- name: Checkout source repository - name: Checkout source repository
@ -24,16 +22,8 @@ jobs:
distribution: "zulu" distribution: "zulu"
java-version: ${{ matrix.java-version }} java-version: ${{ matrix.java-version }}
- name: Download dependencies [examples]
working-directory: examples
run: ./bld download
- name: Compile and run JaCoCo [examples]
working-directory: examples
run: ./bld compile jacoco
- name: Download dependencies - name: Download dependencies
run: ./bld download run: ./bld download
- name: Run tests - name: Run tests
run: ./bld compile test run: ./bld compile test

View file

@ -100,13 +100,10 @@ public class JacocoReportOperationBuild extends Project {
@Override @Override
public void test() throws Exception { public void test() throws Exception {
var os = System.getProperty("os.name"); new ExecOperation()
if (os != null && os.toLowerCase().contains("linux")) { .fromProject(this)
new ExecOperation() .command("scripts/cliargs.sh")
.fromProject(this) .execute();
.command("scripts/cliargs.sh")
.execute();
}
super.test(); super.test();
} }
} }

View file

@ -18,8 +18,6 @@ package rife.bld.extension;
import org.assertj.core.api.AutoCloseableSoftAssertions; import org.assertj.core.api.AutoCloseableSoftAssertions;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledOnOs;
import org.junit.jupiter.api.condition.OS;
import rife.bld.Project; import rife.bld.Project;
import rife.bld.operations.exceptions.ExitStatusException; import rife.bld.operations.exceptions.ExitStatusException;
@ -60,7 +58,6 @@ class JacocoReportOperationTest {
} }
@Test @Test
@EnabledOnOs(OS.LINUX)
void checkAllParamsTest() throws IOException { void checkAllParamsTest() throws IOException {
var supported = List.of("<execfiles>", var supported = List.of("<execfiles>",
"--classfiles", "--classfiles",