From 529d73890ed71488b16a67a96666dc7420ce4f56 Mon Sep 17 00:00:00 2001 From: Mark Nellemann Date: Wed, 4 Jan 2023 14:44:42 +0100 Subject: [PATCH] Build updates. --- .drone.yml | 26 ++++++++++++++++++++++++++ .editorconfig | 5 ++++- CHANGELOG.md | 3 ++- build.gradle | 9 ++++++--- client/build.gradle | 5 ++--- plugins/build.gradle | 3 +-- server/build.gradle | 5 ++--- shared/build.gradle | 21 ++++++++++++--------- 8 files changed, 55 insertions(+), 22 deletions(-) create mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..6377d8b --- /dev/null +++ b/.drone.yml @@ -0,0 +1,26 @@ +--- +kind: pipeline +name: default +type: docker + +steps: +- name: test + image: eclipse-temurin:8-jdk + commands: + - ./gradlew 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 + commands: + - ./gradlew build packages shared:publishLibraryPublicationToGiteaRepository + - for file in server/build/distributions/*.deb ; do curl --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 server/build/distributions/*.rpm ; do curl --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 client/build/distributions/*.deb ; do curl --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 client/build/distributions/*.rpm ; do curl --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 plugins/build/distributions/*.deb ; do curl --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 plugins/build/distributions/*.rpm ; do curl --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/.editorconfig b/.editorconfig index a44e3a4..9ec542f 100644 --- a/.editorconfig +++ b/.editorconfig @@ -5,4 +5,7 @@ end_of_line = lf insert_final_newline = true trim_trailing_whitespace = true indent_style = space -indent_size = 4 \ No newline at end of file +indent_size = 4 + +[*.yml] +indent_size = 2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 96f7cfe..b832495 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,9 @@ All notable changes to this project will be documented in this file. -## [1.1.1] - 2022-12-xx +## [1.1.1] - 2023-01-xx - Simplify plugin naming +- Initial support for calling (groovy) scripts ## [1.1.0] - 2022-12-17 - Lower influx time precision from milliseconds to seconds diff --git a/build.gradle b/build.gradle index 54c513a..0e06668 100644 --- a/build.gradle +++ b/build.gradle @@ -27,11 +27,14 @@ subprojects { mavenCentral() } - sourceCompatibility = 1.8 - targetCompatibility = 1.8 + java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + } -tasks.create("packages") { +tasks.register("packages") { group "build" dependsOn ":client:buildDeb" diff --git a/client/build.gradle b/client/build.gradle index b118c81..4a21d5e 100644 --- a/client/build.gradle +++ b/client/build.gradle @@ -3,9 +3,9 @@ import org.redline_rpm.header.Os plugins { id 'application' - id "com.github.johnrengelman.shadow" version "7.1.2" id "net.nemerosa.versioning" version "2.15.1" - id "nebula.ospackage" version "9.1.1" + id "com.github.johnrengelman.shadow" version "7.1.2" + id "com.netflix.nebula.ospackage" version "10.0.0" } dependencies { @@ -76,7 +76,6 @@ shadowJar { mergeServiceFiles() // Tell plugin to merge duplicate service files } -apply plugin: 'nebula.ospackage' ospackage { packageName = projectName release = '1' diff --git a/plugins/build.gradle b/plugins/build.gradle index b2d4f24..ae6e599 100644 --- a/plugins/build.gradle +++ b/plugins/build.gradle @@ -1,7 +1,7 @@ import org.redline_rpm.header.Os plugins { - id "nebula.ospackage" version "9.1.1" + id "com.netflix.nebula.ospackage" version "10.0.0" } @@ -82,7 +82,6 @@ tasks.clean.dependsOn(tasks.customCleanUp) def projectName = "sysmon-plugins" -apply plugin: 'nebula.ospackage' ospackage { packageName = projectName release = '1' diff --git a/server/build.gradle b/server/build.gradle index d63cdbb..c50c2bf 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -3,9 +3,9 @@ import org.redline_rpm.header.Os plugins { id 'application' - id "com.github.johnrengelman.shadow" version "7.1.2" id "net.nemerosa.versioning" version "2.15.1" - id "nebula.ospackage" version "9.1.1" + id "com.github.johnrengelman.shadow" version "7.1.2" + id "com.netflix.nebula.ospackage" version "10.0.0" } dependencies { @@ -40,7 +40,6 @@ tasks.named('test') { useJUnitPlatform() } -apply plugin: 'nebula.ospackage' ospackage { packageName = projectName release = '1' diff --git a/shared/build.gradle b/shared/build.gradle index 2a8e4e7..d1abc9c 100644 --- a/shared/build.gradle +++ b/shared/build.gradle @@ -36,19 +36,22 @@ tasks.named('test') { } publishing { + publications { + library(MavenPublication) { + groupId = 'sysmon' + artifactId = 'shared' + + from components.java + } + } repositories { maven { - name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/Danish-Sensor-Engineering/libsensor") + name = "gitea" + url = uri("https://git.data.coop/api/packages/$System.env.DRONE_REPO_OWNER/maven") credentials { - username = project.findProperty("gpr.user") ?: System.getenv("USERNAME") - password = project.findProperty("gpr.key") ?: System.getenv("TOKEN") + username = "$System.env.DRONE_REPO_OWNER" + password = "$System.env.AUTH_TOKEN" } } } - publications { - gpr(MavenPublication) { - from(components.java) - } - } }