diff --git a/.blaze/blaze.conf b/.blaze/blaze.conf index 533855a..e899e3e 100644 --- a/.blaze/blaze.conf +++ b/.blaze/blaze.conf @@ -1,3 +1,5 @@ blaze.dependencies = [ - "com.fizzed:jne:4.1.1" + "com.fizzed:blaze-ssh" + "com.fizzed:buildx:1.2.0" + "com.fizzed:jne:4.3.0" ] diff --git a/.blaze/blaze.java b/.blaze/blaze.java index 5bb68ac..b631c04 100644 --- a/.blaze/blaze.java +++ b/.blaze/blaze.java @@ -17,6 +17,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import com.fizzed.buildx.Buildx; +import com.fizzed.buildx.Target; import com.fizzed.jne.JavaHome; import com.fizzed.jne.JavaHomeFinder; import org.slf4j.Logger; @@ -214,5 +216,28 @@ public void update_readme() throws Exception { Thread.sleep(2000L); Files.move(newReadmeFile, readmeFile, StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE); } - + + private final List crossTestTargets = asList( + new Target("linux", "x64").setTags("test").setHost("bmh-build-x64-linux-latest"), + new Target("linux", "arm64").setTags("test").setHost("bmh-build-arm64-linux-latest"), + new Target("linux", "riscv64").setTags("extended-test").setHost("bmh-build-riscv64-linux-latest"), + new Target("linux_musl", "x64").setTags("test").setHost("bmh-build-x64-linux-musl-latest"), + new Target("macos", "x64").setTags("test").setHost("bmh-build-x64-macos-latest"), + new Target("macos", "arm64").setTags("test").setHost("bmh-build-arm64-macos-latest"), + new Target("windows", "x64").setTags("test").setHost("bmh-build-x64-windows-latest"), + new Target("windows", "arm64").setTags("test").setHost("bmh-build-arm64-windows-latest"), + new Target("freebsd", "x64").setTags("test").setHost("bmh-build-x64-freebsd-latest"), + new Target("openbsd", "x64").setTags("test").setHost("bmh-build-x64-openbsd-latest") + ); + + @Task(order = 100) + public void cross_tests() throws Exception { + new Buildx(crossTestTargets) + .tags("test") + .execute((target, project) -> { + project.action("mvn", "clean", "test") + .run(); + }); + } + } \ No newline at end of file diff --git a/.blaze/pom.xml b/.blaze/pom.xml index f5c05dc..e32e2d9 100644 --- a/.blaze/pom.xml +++ b/.blaze/pom.xml @@ -20,50 +20,60 @@ ${project.basedir} + + org.apache.ivy + ivy + 2.5.2 + com.fizzed - blaze-ivy - 1.5.0 + blaze-core + 1.8.0 commons-io commons-io - 2.11.0 - - - org.slf4j - slf4j-api - 2.0.7 + 2.16.1 com.typesafe config - 1.3.0 - - - org.apache.ivy - ivy - 2.5.2 + 1.4.3 com.fizzed - blaze-core - 1.5.0 + blaze-ivy + 1.8.0 org.slf4j slf4j-simple - 2.0.7 + 2.0.13 + + + org.slf4j + slf4j-api + 2.0.13 org.zeroturnaround zt-exec 1.12 + + com.fizzed + blaze-ssh + 1.8.0 + + + com.fizzed + buildx + 1.2.0 + com.fizzed jne - 4.1.1 + 4.3.0 \ No newline at end of file diff --git a/.github/workflows/macos-arm64.yaml b/.github/workflows/macos-arm64.yaml index d50323a..ba81935 100644 --- a/.github/workflows/macos-arm64.yaml +++ b/.github/workflows/macos-arm64.yaml @@ -7,7 +7,7 @@ jobs: runs-on: macos-latest steps: - uses: actions/checkout@v3 - - name: Set up Azul JDK 8 + - name: Set up Azul JDK 11 uses: actions/setup-java@v3 with: java-version: 11 diff --git a/.github/workflows/windows-x64.yaml b/.github/workflows/windows-x64.yaml index 5423b91..3576249 100644 --- a/.github/workflows/windows-x64.yaml +++ b/.github/workflows/windows-x64.yaml @@ -7,7 +7,7 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v3 - - name: Set up Azul JDK 8 + - name: Set up Azul JDK 11 uses: actions/setup-java@v3 with: java-version: 11 diff --git a/.gitignore b/.gitignore index 2e47db9..185a9df 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ target .idea .gradle build +.buildx diff --git a/README.md b/README.md index be7a265..043c00c 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,29 @@ [![Maven Central](https://img.shields.io/maven-central/v/com.fizzed/rocker?color=blue&style=flat-square)](https://mvnrepository.com/artifact/com.fizzed/rocker) +## Automated Testing + +The following Java versions and platforms are tested using GitHub workflows: + [![Java 8](https://img.shields.io/github/actions/workflow/status/fizzed/rocker/java8.yaml?branch=master&label=Java%208&style=flat-square)](https://github.com/fizzed/rocker/actions/workflows/java8.yaml) [![Java 11](https://img.shields.io/github/actions/workflow/status/fizzed/rocker/java11.yaml?branch=master&label=Java%2011&style=flat-square)](https://github.com/fizzed/rocker/actions/workflows/java11.yaml) [![Java 17](https://img.shields.io/github/actions/workflow/status/fizzed/rocker/java17.yaml?branch=master&label=Java%2017&style=flat-square)](https://github.com/fizzed/rocker/actions/workflows/java17.yaml) [![Java 21](https://img.shields.io/github/actions/workflow/status/fizzed/rocker/java21.yaml?branch=master&label=Java%2021&style=flat-square)](https://github.com/fizzed/rocker/actions/workflows/java21.yaml) +[![Linux x64](https://img.shields.io/github/actions/workflow/status/fizzed/rocker/java8.yaml?branch=master&label=Linux%20x64&style=flat-square)](https://github.com/fizzed/rocker/actions/workflows/java8.yaml) +[![MacOS arm64](https://img.shields.io/github/actions/workflow/status/fizzed/rocker/macos-arm64.yaml?branch=master&label=MacOS%20arm64&style=flat-square)](https://github.com/fizzed/rocker/actions/workflows/macos-arm64.yaml) +[![Windows x64](https://img.shields.io/github/actions/workflow/status/fizzed/rocker/windows-x64.yaml?branch=master&label=Windows%20x64&style=flat-square)](https://github.com/fizzed/rocker/actions/workflows/windows-x64.yaml) + +The following platforms are tested using the [Fizzed, Inc.](http://fizzed.com) build system: + +[![Linux arm64](https://img.shields.io/badge/Linux%20arm64-passing-green)](buildx-results.txt) +[![Linux riscv64](https://img.shields.io/badge/Linux%20riscv64-passing-green)](buildx-results.txt) +[![Linux MUSL x64](https://img.shields.io/badge/Linux%20MUSL%20x64-passing-green)](buildx-results.txt) +[![MacOS x64](https://img.shields.io/badge/MacOS%20x64-passing-green)](buildx-results.txt) +[![Windows arm64](https://img.shields.io/badge/Windows%20arm64-passing-green)](buildx-results.txt) +[![FreeBSD x64](https://img.shields.io/badge/FreeBSD%20x64-passing-green)](buildx-results.txt) +[![OpenBSD x64](https://img.shields.io/badge/OpenBSD%20x64-passing-green)](buildx-results.txt) + ## Overview Rocker is a Java 8+ optimized, near zero-copy rendering, diff --git a/blaze.jar b/blaze.jar index de4a448..d24b673 100644 Binary files a/blaze.jar and b/blaze.jar differ diff --git a/buildx-results.txt b/buildx-results.txt new file mode 100644 index 0000000..53c9b12 --- /dev/null +++ b/buildx-results.txt @@ -0,0 +1,16 @@ +Buildx Results +-------------- +Cross platform tests use the Buildx project: https://github.com/fizzed/buildx +Commit: 49cd2575e4d4f6456a8b9f4bdc10cac1b5991061 +Date: 2025-01-10T20:36:56.774381Z[UTC] + +linux-x64 success +linux-arm64 success +linux_musl-x64 success +macos-x64 success +macos-arm64 success +windows-x64 success +windows-arm64 success +freebsd-x64 success +openbsd-x64 success +