Merge pull request #2 from thc202/update-add-on-plugin

Update Gradle and add-on plugin

Author: psiinon

.github/main.workflow

@@ -0,0 +1,23 @@
+workflow "Release Add-On" {
+  on = "push"
+  resolves = ["Build and Release Add-On"]
+}
+
+action "Add-On Tag Filter" {
+  uses = "actions/bin/filter@3c0b4f0e63ea54ea5df2914b4fabf383368cd0da"
+  args = "tag v*"
+}
+
+action "Actor Filter" {
+  uses = "actions/bin/filter@3c0b4f0e63ea54ea5df2914b4fabf383368cd0da"
+  needs = ["Add-On Tag Filter"]
+  args = ["actor", "kingthorin", "psiinon", "thc202"]
+}
+
+action "Build and Release Add-On" {
+  uses = "docker://openjdk:8"
+  needs = ["Actor Filter"]
+  runs = "./gradlew"
+  args = "createReleaseFromGitHubRef"
+  secrets = ["GITHUB_TOKEN"]
+}

build.gradle.kts

@@ -1,10 +1,13 @@
+import org.zaproxy.gradle.addon.AddOnPlugin
 import org.zaproxy.gradle.addon.AddOnStatus
-import org.zaproxy.gradle.addon.manifest.tasks.ConvertChangelogToChanges
+import org.zaproxy.gradle.addon.misc.ConvertMarkdownToHtml
+import org.zaproxy.gradle.addon.misc.CreateGitHubRelease
+import org.zaproxy.gradle.addon.misc.ExtractLatestChangesFromChangelog
 
 plugins {
     `java-library`
     eclipse
-    id("org.zaproxy.add-on") version "0.1.0"
+    id("org.zaproxy.add-on") version "0.2.0"
 }
 
 eclipse {
@@ -22,23 +25,48 @@ java {
     targetCompatibility = JavaVersion.VERSION_1_8
 }
 
-val generateManifestChanges by tasks.registering(ConvertChangelogToChanges::class) {
-    changelog.set(file("CHANGELOG.md"))
-    manifestChanges.set(file("$buildDir/zapAddOn/manifest-changes.html"))
-}
-
 zapAddOn {
     addOnName.set("FuzzDB Web Backdoors")
     addOnStatus.set(AddOnStatus.RELEASE)
     zapVersion.set("2.5.0")
 
+    releaseLink.set("https://github.com/zaproxy/fuzzdb-web-backdoors/compare/v@PREVIOUS_VERSION@...v@CURRENT_VERSION@")
+    unreleasedLink.set("https://github.com/zaproxy/fuzzdb-web-backdoors/compare/v@CURRENT_VERSION@...HEAD")
+
     manifest {
         author.set("ZAP Dev Team")
         url.set("https://github.com/fuzzdb-project/fuzzdb/")
-        changesFile.set(generateManifestChanges.flatMap { it.manifestChanges })
+        changesFile.set(tasks.named<ConvertMarkdownToHtml>("generateManifestChanges").flatMap { it.html })
+    }
+}
+
+System.getenv("GITHUB_REF")?.let { ref ->
+    if ("refs/tags/" !in ref) {
+        return@let
     }
 
-    zapVersions {
-        downloadUrl.set("https://github.com/zaproxy/fuzzdb-web-backdoors/releases/download/v$version")
+    tasks.register<CreateGitHubRelease>("createReleaseFromGitHubRef") {
+        val targetTag = ref.removePrefix("refs/tags/")
+        val targetAddOnVersion = targetTag.removePrefix("v")
+
+        authToken.set(System.getenv("GITHUB_TOKEN"))
+        repo.set(System.getenv("GITHUB_REPOSITORY"))
+        tag.set(targetTag)
+
+        title.set(provider { "v${zapAddOn.addOnVersion.get()}" })
+        bodyFile.set(tasks.named<ExtractLatestChangesFromChangelog>("extractLatestChanges").flatMap { it.latestChanges })
+
+        assets {
+            register("add-on") {
+                file.set(tasks.named<Jar>(AddOnPlugin.JAR_ZAP_ADD_ON_TASK_NAME).flatMap { it.archiveFile })
+            }
+        }
+
+        doFirst {
+            val addOnVersion = zapAddOn.addOnVersion.get()
+            require(addOnVersion == targetAddOnVersion) {
+                "Version of the tag $targetAddOnVersion does not match the version of the add-on $addOnVersion"
+            }
+        }
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists