Update workflows for composite build, remove Danger

futuredapp · Nov 20, 2023 · ad9c292 · ad9c292
1 parent 4979471
commit ad9c292
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 66 deletions.
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   validation:
-    name: Validation
+    name: Gradle Wrapper Validation
     runs-on: ubuntu-latest
     steps:
       - name: Checkout latest code

diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
@@ -9,20 +9,11 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  validation:
-    name: Validation
+  check:
+    name: Check
     runs-on: ubuntu-latest
     steps:
       - name: Checkout latest code
         uses: actions/checkout@v4
       - name: Run check
-        run: ./gradlew check
-      - name: Danger Report
-        uses: MeilCli/danger-action@v2
-        continue-on-error: true
-        with:
-          plugins_file: 'Gemfile'
-          danger_file: 'Dangerfile'
-          danger_id: 'danger-pr'
-        env:
-          DANGER_GITHUB_API_TOKEN: ${{ secrets.DANGER_GITHUB_API_TOKEN }}
+        run: ./gradlew --project-dir plugin-build check
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
       - name: Run check
-        run: ./gradlew check
+        run: ./gradlew --project-dir plugin-build check
       - name: Publish on Plugin Portal
         run: ./gradlew --project-dir plugin-build setupPublishSecrets publishPlugins
         if: success()
diff --git a/Dangerfile b/Dangerfile
diff --git a/Gemfile b/Gemfile
diff --git a/config/detekt.yml b/config/detekt.yml
@@ -1,5 +1,5 @@
 build:
-  maxIssues: 50
+  maxIssues: 5
   excludeCorrectable: false
 
 config:

diff --git a/plugin-build/gradle/libs.versions.toml b/plugin-build/gradle/libs.versions.toml
diff --git a/plugin-build/plugin/build.gradle.kts b/plugin-build/plugin/build.gradle.kts
@@ -54,7 +54,7 @@ tasks.create("setupPublishSecrets") {
 detekt {
     ignoreFailures = false
     source.setFrom(files(projectDir))
-    config.setFrom(files("$rootDir/config/detekt.yml"))
+    config.setFrom(files("$rootDir/../config/detekt.yml"))
     buildUponDefaultConfig = true
 }
 

diff --git a/plugin-build/settings.gradle.kts b/plugin-build/settings.gradle.kts
@@ -9,8 +9,14 @@ dependencyResolutionManagement {
     repositories {
         mavenCentral()
     }
+
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
 }
 
 rootProject.name = "app.futured.sheethappens"
 
-include(":plugin")
+include(":plugin")