[calcite] branch main updated: [CALCITE-5785] Gradle remote build caching is broken for :babel:fmppMain and :server:fmppMain tasks

[jhyde]

This is an automated email from the ASF dual-hosted git repository.

jhyde pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/calcite.git


The following commit(s) were added to refs/heads/main by this push:
     new f48393ce24 [CALCITE-5785] Gradle remote build caching is broken for 
:babel:fmppMain and :server:fmppMain tasks
f48393ce24 is described below

commit f48393ce24ba931ac3e3f3c9e942a60189eda81d
Author: Akshay Dayal <ada...@gradle.com>
AuthorDate: Sat Jun 17 14:55:46 2023 -0600

    [CALCITE-5785] Gradle remote build caching is broken for :babel:fmppMain 
and :server:fmppMain tasks
    
    The :babel:fmppMain and :server:fmppMain tasks currently do
    not work with remote build caching.
    
    One of the inputs is a directory and currently it's
    configured to look at the absolute path instead of the
    relative path. This causes different input hashes to be
    computed on different machines, hence the tasks do not work
    correctly with remote build caching.
    
    This commit addresses the issue by making the hashes for
    input directories look at the relative path.
---
 babel/build.gradle.kts  | 2 +-
 server/build.gradle.kts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/babel/build.gradle.kts b/babel/build.gradle.kts
index ab141794cf..82d1ebd1b3 100644
--- a/babel/build.gradle.kts
+++ b/babel/build.gradle.kts
@@ -39,7 +39,7 @@ dependencies {
 }
 
 val fmppMain by 
tasks.registering(org.apache.calcite.buildtools.fmpp.FmppTask::class) {
-    inputs.dir("src/main/codegen")
+    
inputs.dir("src/main/codegen").withPathSensitivity(PathSensitivity.RELATIVE)
     config.set(file("src/main/codegen/config.fmpp"))
     templates.set(file("$rootDir/core/src/main/codegen/templates"))
 }
diff --git a/server/build.gradle.kts b/server/build.gradle.kts
index 161db9ffd8..4f91a925b8 100644
--- a/server/build.gradle.kts
+++ b/server/build.gradle.kts
@@ -39,7 +39,7 @@ dependencies {
 }
 
 val fmppMain by 
tasks.registering(org.apache.calcite.buildtools.fmpp.FmppTask::class) {
-    inputs.dir("src/main/codegen")
+    
inputs.dir("src/main/codegen").withPathSensitivity(PathSensitivity.RELATIVE)
     config.set(file("src/main/codegen/config.fmpp"))
     templates.set(file("$rootDir/core/src/main/codegen/templates"))
 }