Add OS matrix for Ubuntu, Windows and macOS

This commit is contained in:
Erik C. Thauvin 2025-03-25 21:48:14 -07:00
parent 0f7a7cf090
commit f43b3e18d2
Signed by: erik
GPG key ID: 776702A6A2DA330E
6 changed files with 35 additions and 14 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
@ -22,8 +24,16 @@ 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: Run tests with 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

6
examples/.idea/bld.xml generated Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="BldConfiguration">
<events />
</component>
</project>

View file

@ -1,8 +1,8 @@
bld.downloadExtensionJavadoc=false bld.downloadExtensionJavadoc=false
bld.downloadExtensionSources=true bld.downloadExtensionSources=true
bld.downloadLocation= bld.downloadLocation=
bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.9 bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.10-SNAPSHOT
bld.extension-testng=com.uwyn.rife2:bld-testng:1.0.2 bld.extension-testng=com.uwyn.rife2:bld-testng:1.0.3-SNAPSHOT
bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
bld.sourceDirectories= bld.sourceDirectories=
bld.version=2.2.1 bld.version=2.2.1

View file

@ -6,7 +6,6 @@ import rife.bld.extension.JacocoReportOperation;
import rife.bld.extension.TestNgOperation; import rife.bld.extension.TestNgOperation;
import rife.bld.operations.TestOperation; import rife.bld.operations.TestOperation;
import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.logging.ConsoleHandler; import java.util.logging.ConsoleHandler;
import java.util.logging.Level; import java.util.logging.Level;
@ -17,7 +16,7 @@ import static rife.bld.dependencies.Scope.test;
/** /**
* Example build. * Example build.
* *
* <pre>{@code * <pre>{@code
* ./bld compile test * ./bld compile test
* ./bld compile jacoco * ./bld compile jacoco

View file

@ -33,7 +33,7 @@ public class TestNgOperationBuild extends Project {
public TestNgOperationBuild() { public TestNgOperationBuild() {
pkg = "rife.bld.extension"; pkg = "rife.bld.extension";
name = "bld-testng"; name = "bld-testng";
version = version(1, 0, 2); version = version(1, 0, 3, "SNAPSHOT");
javaRelease = 17; javaRelease = 17;
@ -100,10 +100,13 @@ public class TestNgOperationBuild extends Project {
@Override @Override
public void test() throws Exception { public void test() throws Exception {
new ExecOperation() var os = System.getProperty("os.name");
.fromProject(this) if (os != null && os.toLowerCase().contains("linux")) {
.command("scripts/cliargs.sh") new ExecOperation()
.execute(); .fromProject(this)
.command("scripts/cliargs.sh")
.execute();
}
super.test(); super.test();
} }
} }

View file

@ -18,6 +18,8 @@ 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.blueprints.BaseProjectBlueprint; import rife.bld.blueprints.BaseProjectBlueprint;
import rife.bld.operations.exceptions.ExitStatusException; import rife.bld.operations.exceptions.ExitStatusException;
@ -51,6 +53,7 @@ class TestNgOperationTest {
} }
@Test @Test
@EnabledOnOs(OS.LINUX)
void testCheckAllParameters() throws IOException { void testCheckAllParameters() throws IOException {
var args = Files.readAllLines(Paths.get("src", "test", "resources", "testng-args.txt")); var args = Files.readAllLines(Paths.get("src", "test", "resources", "testng-args.txt"));