From 38edd74f8dd22df9d77f59333b391e8a4ef5132d Mon Sep 17 00:00:00 2001 From: Mark Nellemann Date: Sat, 24 Jun 2023 09:04:58 +0200 Subject: [PATCH] Build improvements. --- .drone.yml | 12 ++++++------ gradle.properties | 2 +- .../nellemann/jperf/{App.java => Application.java} | 6 +++--- .../jperf/{AppTest.groovy => ApplicationTest.groovy} | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) rename src/main/java/biz/nellemann/jperf/{App.java => Application.java} (91%) rename src/test/groovy/biz/nellemann/jperf/{AppTest.groovy => ApplicationTest.groovy} (75%) diff --git a/.drone.yml b/.drone.yml index f79fae7..0e0e573 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,17 +7,17 @@ steps: - name: test image: eclipse-temurin:8-jdk commands: - - ./gradlew test + - ./gradlew --quiet --no-daemon test - name: build image: eclipse-temurin:8-jdk environment: AUTH_TOKEN: # Gitea access token ENV variable - from_secret: auth # Name of DroneCI secret exposed above + from_secret: AUTH_TOKEN # Name of DroneCI secret exposed above commands: - - ./gradlew build packages - - for file in build/libs/*-all.jar ; do curl --user "${DRONE_REPO_OWNER}:$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done - - for file in build/distributions/*.deb ; do curl --user "${DRONE_REPO_OWNER}:$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done - - for file in build/distributions/*.rpm ; do curl --user "${DRONE_REPO_OWNER}:$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done + - ./gradlew --quiet --no-daemon build packages + - for file in build/libs/*-all.jar ; do curl -s --user "$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done + - for file in build/distributions/*.deb ; do curl -s --user "$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done + - for file in build/distributions/*.rpm ; do curl -s --user "$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done when: event: - tag diff --git a/gradle.properties b/gradle.properties index fb6e7c5..3b1c07f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ projectId = jperf projectGroup = biz.nellemann.jperf -projectVersion = 0.0.1 +projectVersion = 0.0.2 diff --git a/src/main/java/biz/nellemann/jperf/App.java b/src/main/java/biz/nellemann/jperf/Application.java similarity index 91% rename from src/main/java/biz/nellemann/jperf/App.java rename to src/main/java/biz/nellemann/jperf/Application.java index 34f4cdb..3748326 100644 --- a/src/main/java/biz/nellemann/jperf/App.java +++ b/src/main/java/biz/nellemann/jperf/Application.java @@ -15,9 +15,9 @@ import java.util.concurrent.Callable; @Command(name = "jperf", mixinStandardHelpOptions = true, version = "0.1", description = "Network performance measurement tool.") -public class App implements Callable { +public class Application implements Callable { - final Logger log = LoggerFactory.getLogger(App.class); + final Logger log = LoggerFactory.getLogger(Application.class); @CommandLine.Option(names = { "-c", "--connect" }, paramLabel = "SERVER", description = "run client and connect to remote server") @@ -54,7 +54,7 @@ public class App implements Callable { public static void main(String... args) { - int exitCode = new CommandLine(new App()).execute(args); + int exitCode = new CommandLine(new Application()).execute(args); System.exit(exitCode); } diff --git a/src/test/groovy/biz/nellemann/jperf/AppTest.groovy b/src/test/groovy/biz/nellemann/jperf/ApplicationTest.groovy similarity index 75% rename from src/test/groovy/biz/nellemann/jperf/AppTest.groovy rename to src/test/groovy/biz/nellemann/jperf/ApplicationTest.groovy index 5826a83..605ceb4 100644 --- a/src/test/groovy/biz/nellemann/jperf/AppTest.groovy +++ b/src/test/groovy/biz/nellemann/jperf/ApplicationTest.groovy @@ -5,7 +5,7 @@ package biz.nellemann.jperf import spock.lang.Specification -class AppTest extends Specification { +class ApplicationTest extends Specification { }