1.0.2: Linux fixes, update CI with testing

Kord-Extensions · Jul 24, 2024 · 95da4f0 · 95da4f0
1 parent 371362e
commit 95da4f0
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -38,7 +38,7 @@ jobs:
           TOKEN: "${{ secrets.TOKEN }}"
 
       - name: Gradle (Test)
-        run: "./gradlew build"
+        run: "./gradlew build --info --stacktrace"
         working-directory: "./testModule"
 
       - name: Upload plugin JARs

diff --git a/.github/workflows/root.yml b/.github/workflows/root.yml
@@ -47,7 +47,7 @@ jobs:
           TOKEN: "${{ secrets.TOKEN }}"
 
       - name: Gradle (Test)
-        run: "./gradlew build"
+        run: "./gradlew build --info --stacktrace"
         working-directory: "./testModule"
 
       - name: Upload plugin JARs

diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
@@ -36,17 +36,25 @@ jobs:
           global: true
           token: '${{ secrets.GITHUB_TOKEN }}'
 
-      - name: Gradle (Build)
-        uses: gradle/gradle-build-action@v3
+
+      - name: Gradle (Setup)
+        uses: gradle/actions/setup-gradle@v3
 
         with:
-          arguments: checkLicenses build
+          dependency-graph: generate-and-submit
+
+      - name: Gradle (Build)
+        run: "./gradlew checkLicenses build publishToMavenLocal"
 
         env:
           TOKEN: "${{ secrets.TOKEN }}"
 
+      - name: Gradle (Test)
+        run: "./gradlew build --info --stacktrace"
+        working-directory: "./testModule"
+
       - name: Gradle (Publish)
-        uses: gradle/gradle-build-action@v3
+        run: "./gradlew publishPlugins"
 
         env:
           ORG_GRADLE_PROJECT_signingKey: "${{ secrets.GPG_KEY }}"
@@ -57,9 +65,6 @@ jobs:
 
           TOKEN: "${{ secrets.TOKEN }}"
 
-        with:
-          arguments: publishPlugins
-
       - name: Create release description
         run: kotlin .github/tag.main.kts
 

diff --git a/changes/1.0.2.md b/changes/1.0.2.md
@@ -0,0 +1,9 @@
+# Gradle Plugins 1.0.2
+
+This version targets the recently released KordEx plugin with a bug fix.
+
+## KordEx Plugin
+
+This release includes the following fixes:
+
+- Previously, the plugin would error on Linux due to a failure to create a directory for the plugin-generated resource files. This was due to Gradle's layout API unexpectedly treating subfiles starting with `/` as if they were within the filesystem root.
diff --git a/kordex/src/main/kotlin/dev/kordex/gradle/plugins/kordex/KordExPlugin.kt b/kordex/src/main/kotlin/dev/kordex/gradle/plugins/kordex/KordExPlugin.kt
@@ -279,12 +279,8 @@ class KordExPlugin : Plugin<Project> {
 		kordVersion: String?,
 		kordExVersion: String
 	) {
-		val outputDir = target.layout.buildDirectory.file("/generated")
-		val outputFile = target.layout.buildDirectory.file("/generated/kordex.properties")
-
-		if (!outputDir.get().asFile.exists()) {
-			outputDir.get().asFile.mkdirs()
-		}
+		val outputDir = target.layout.buildDirectory.dir("generated")
+		val outputFile = target.layout.buildDirectory.file("generated/kordex.properties")
 
 		val task = target.tasks.create("generateMetadata") {
 			group = "generation"