From f980f802ad41d696eac57cb537ba23406db8780a Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Wed, 6 Mar 2024 14:07:02 +0100 Subject: [PATCH 1/3] fix for mac permissions pre-commit #612 --- core/build.gradle.kts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 196eaba1cb..3a2d84b06c 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -6,6 +6,7 @@ import nl.jolanrensen.docProcessor.gradle.creatingProcessDocTask import org.gradle.jvm.tasks.Jar import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jmailen.gradle.kotlinter.tasks.LintTask +import xyz.ronella.gradle.plugin.simple.git.OSType import xyz.ronella.gradle.plugin.simple.git.task.GitTask plugins { @@ -173,6 +174,12 @@ val installGitPreCommitHook by tasks.creating(Copy::class) { from(File(rootProject.rootDir, "gradle/scripts/pre-commit")) into(gitHooksDir) fileMode = 755 + + // Workaround for https://github.com/Kotlin/dataframe/issues/612 + if (OSType.identify() == OSType.Mac) exec { + workingDir(gitHooksDir) + commandLine("chmod", "755", "pre-commit") + } } else { logger.lifecycle("'.git/hooks' directory not found. Skipping installation of pre-commit hook.") } From f2b050d687887fe3dd3d13f3710e5dedcf42c794 Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Thu, 7 Mar 2024 12:23:02 +0100 Subject: [PATCH 2/3] fixup! fix for mac permissions pre-commit #612 --- core/build.gradle.kts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 3a2d84b06c..8c041cdee7 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -176,9 +176,11 @@ val installGitPreCommitHook by tasks.creating(Copy::class) { fileMode = 755 // Workaround for https://github.com/Kotlin/dataframe/issues/612 - if (OSType.identify() == OSType.Mac) exec { - workingDir(gitHooksDir) - commandLine("chmod", "755", "pre-commit") + if (OSType.identify() == OSType.Mac) doLast { + exec { + workingDir(gitHooksDir) + commandLine("chmod", "755", "pre-commit") + } } } else { logger.lifecycle("'.git/hooks' directory not found. Skipping installation of pre-commit hook.") From 1497f179237a26d0904417d00a62537f2c60ad8e Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Fri, 8 Mar 2024 17:35:30 +0100 Subject: [PATCH 3/3] enabling workaround for Linux too --- core/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 8c041cdee7..3c4c77a9b4 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -176,7 +176,7 @@ val installGitPreCommitHook by tasks.creating(Copy::class) { fileMode = 755 // Workaround for https://github.com/Kotlin/dataframe/issues/612 - if (OSType.identify() == OSType.Mac) doLast { + if (OSType.identify() in listOf(OSType.Mac, OSType.Linux)) doLast { exec { workingDir(gitHooksDir) commandLine("chmod", "755", "pre-commit")