Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .blaze/blaze.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
blaze.dependencies = [
"com.fizzed:blaze-ssh"
"com.fizzed:blaze-public-project:1.0.1"
"com.fizzed:blaze-public-project:3.1.0"
]
16 changes: 3 additions & 13 deletions .blaze/blaze.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import static com.fizzed.blaze.Systems.exec;

import com.fizzed.blaze.Task;
import com.fizzed.blaze.TaskGroup;
import com.fizzed.blaze.project.PublicBlaze;
import com.fizzed.buildx.Buildx;
import com.fizzed.buildx.Target;

import java.util.List;
import java.util.stream.Collectors;

@TaskGroup(value="project", name="Project", order=1)
@TaskGroup(value="maintainers", name="Maintainers Only", order=2)
public class blaze extends PublicBlaze {

@Override
Expand All @@ -16,14 +14,6 @@ protected int minimumSupportedJavaVersion() {
return 11;
}

@Override
protected List<Target> crossTestTargets() {
// weird gradle test issue occurs only on riscv64
return super.crossTestTargets().stream()
.filter(v -> !v.getArch().contains("riscv64"))
.collect(Collectors.toList());
}

// public demos

@Task(order=1, value="Demo of parsing a template and logs its structure. Argument of -Drocker.file=<file>")
Expand Down
47 changes: 21 additions & 26 deletions .blaze/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
-->

<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.install.skip>true</maven.install.skip>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
Expand All @@ -22,53 +22,48 @@
<dependencies>
<dependency>
<groupId>com.fizzed</groupId>
<artifactId>blaze-ivy</artifactId>
<version>1.9.0</version>
</dependency>
<dependency>
<groupId>org.apache.ivy</groupId>
<artifactId>ivy</artifactId>
<version>2.5.2</version>
<artifactId>blaze-core</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.16.1</version>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.17</version>
</dependency>
<dependency>
<groupId>com.typesafe</groupId>
<artifactId>config</artifactId>
<version>1.4.3</version>
</dependency>
<dependency>
<groupId>com.fizzed</groupId>
<artifactId>blaze-core</artifactId>
<version>1.9.0</version>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.20.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>2.0.13</version>
<groupId>org.zeroturnaround</groupId>
<artifactId>zt-exec</artifactId>
<version>1.12</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.13</version>
<groupId>com.fizzed</groupId>
<artifactId>blaze-ivy</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>org.zeroturnaround</groupId>
<artifactId>zt-exec</artifactId>
<version>1.12</version>
<groupId>org.apache.ivy</groupId>
<artifactId>ivy</artifactId>
<version>2.5.3</version>
</dependency>
<dependency>
<groupId>com.fizzed</groupId>
<artifactId>blaze-ssh</artifactId>
<version>1.9.0</version>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>com.fizzed</groupId>
<artifactId>blaze-public-project</artifactId>
<version>1.0.1</version>
<version>3.1.0</version>
</dependency>
</dependencies>
</project>
18 changes: 18 additions & 0 deletions .github/workflows/java25.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Java 25
on:
- push
- workflow_dispatch
jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 40
steps:
- uses: actions/checkout@v3
- name: Set up Azul JDK 25
uses: actions/setup-java@v3
with:
java-version: 25
distribution: 'zulu'
cache: 'maven'
- name: Test in Maven
run: mvn test
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ target
.gradle
build
.buildx
.buildx-cache
.buildx-logs
20 changes: 13 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,26 @@ The following Java versions and platforms are tested using GitHub workflows:
[![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)
[![Java 25](https://img.shields.io/github/actions/workflow/status/fizzed/rocker/java25.yaml?branch=master&label=Java%2025&style=flat-square)](https://github.com/fizzed/rocker/actions/workflows/java25.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)
[![FreeBSD x64](https://img.shields.io/badge/FreeBSD_x64-passing-brightgreen?style=flat-square)](buildx-results.txt)
[![FreeBSD arm64](https://img.shields.io/badge/FreeBSD_arm64-passing-brightgreen?style=flat-square)](buildx-results.txt)
[![Linux arm64](https://img.shields.io/badge/Linux_arm64-passing-brightgreen?style=flat-square)](buildx-results.txt)
[![Linux armhf](https://img.shields.io/badge/Linux_armhf-passing-brightgreen?style=flat-square)](buildx-results.txt)
[![Linux riscv64](https://img.shields.io/badge/Linux_riscv64-passing-brightgreen?style=flat-square)](buildx-results.txt)
[![Linux MUSL x64](https://img.shields.io/badge/Linux_MUSL_x64-passing-brightgreen?style=flat-square)](buildx-results.txt)
[![Linux MUSL arm64](https://img.shields.io/badge/Linux_MUSL_arm64-passing-brightgreen?style=flat-square)](buildx-results.txt)
[![Linux MUSL riscv64](https://img.shields.io/badge/Linux_MUSL_riscv64-passing-brightgreen?style=flat-square)](buildx-results.txt)
[![MacOS x64](https://img.shields.io/badge/MacOS_x64-passing-brightgreen?style=flat-square)](buildx-results.txt)
[![OpenBSD x64](https://img.shields.io/badge/OpenBSD_x64-passing-brightgreen?style=flat-square)](buildx-results.txt)
[![OpenBSD arm64](https://img.shields.io/badge/OpenBSD_arm64-passing-brightgreen?style=flat-square)](buildx-results.txt)
[![Windows arm64](https://img.shields.io/badge/Windows_arm64-passing-brightgreen?style=flat-square)](buildx-results.txt)

## Overview

Expand Down
Binary file modified blaze.jar
Binary file not shown.
Loading