Compare commits

..

2 commits

2 changed files with 22 additions and 8 deletions

View file

@ -1,14 +1,16 @@
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
@ -26,4 +28,4 @@ jobs:
run: ./bld download run: ./bld download
- name: Run tests - name: Run tests
run: ./bld compile test run: ./bld compile test

View file

@ -17,6 +17,8 @@
package rife.bld.extension; package rife.bld.extension;
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.BaseProject; import rife.bld.BaseProject;
import rife.bld.Project; import rife.bld.Project;
import rife.bld.WebProject; import rife.bld.WebProject;
@ -24,6 +26,7 @@ import rife.bld.operations.exceptions.ExitStatusException;
import java.io.File; import java.io.File;
import java.util.List; import java.util.List;
import java.util.Locale;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatCode;
@ -31,6 +34,8 @@ import static org.assertj.core.api.Assertions.assertThatCode;
class ExecOperationTest { class ExecOperationTest {
private static final String FOO = "foo"; private static final String FOO = "foo";
private static final boolean IS_WINDOWS = System.getProperty("os.name").toLowerCase(Locale.US).contains("win");
private static final String CAT = IS_WINDOWS ? "type" : "cat";
@Test @Test
void testCommand() { void testCommand() {
@ -53,7 +58,7 @@ class ExecOperationTest {
assertThatCode(() -> assertThatCode(() ->
new ExecOperation() new ExecOperation()
.fromProject(new BaseProject()) .fromProject(new BaseProject())
.command(List.of("cat", FOO)) .command(List.of(CAT, FOO))
.execute()).isInstanceOf(ExitStatusException.class); .execute()).isInstanceOf(ExitStatusException.class);
} }
@ -61,7 +66,7 @@ class ExecOperationTest {
void testFailOnExit() { void testFailOnExit() {
var op = new ExecOperation() var op = new ExecOperation()
.fromProject(new BaseProject()) .fromProject(new BaseProject())
.command(List.of("cat", FOO)) .command(List.of(CAT, FOO))
.failOnExit(false); .failOnExit(false);
assertThat(op.isFailOnExit()).isFalse(); assertThat(op.isFailOnExit()).isFalse();
assertThatCode(op::execute).doesNotThrowAnyException(); assertThatCode(op::execute).doesNotThrowAnyException();
@ -72,15 +77,22 @@ class ExecOperationTest {
@Test @Test
void testTimeout() { void testTimeout() {
List<String> sleep;
if (IS_WINDOWS) {
sleep = List.of("timeout", "/t", "10");
} else {
sleep = List.of("sleep", "10");
}
var op = new ExecOperation() var op = new ExecOperation()
.fromProject(new BaseProject()) .fromProject(new BaseProject())
.timeout(5) .timeout(5)
.command(List.of("sleep", "10")); .command(sleep);
assertThat(op.timeout()).isEqualTo(5); assertThat(op.timeout()).isEqualTo(5);
assertThatCode(op::execute).isInstanceOf(ExitStatusException.class); assertThatCode(op::execute).isInstanceOf(ExitStatusException.class);
} }
@Test @Test
@EnabledOnOs({OS.LINUX, OS.MAC})
void testTouch() throws Exception { void testTouch() throws Exception {
var tmpFile = new File("hello.tmp"); var tmpFile = new File("hello.tmp");
tmpFile.deleteOnExit(); tmpFile.deleteOnExit();