From e0a7907e5769b1c851cd4a8df6ce5f32b12f375b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20M=C3=BChleisen?= <hannes@muehleisen.org>
Date: Tue, 29 Oct 2024 14:52:50 +0100
Subject: [PATCH] another attempt at fixing deploy

---
 .github/workflows/Java.yml   | 1 -
 scripts/jdbc_maven_deploy.py | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/Java.yml b/.github/workflows/Java.yml
index 088dbedd..1912f3bb 100644
--- a/.github/workflows/Java.yml
+++ b/.github/workflows/Java.yml
@@ -240,7 +240,6 @@ jobs:
         shell: bash
         run: |
           mkdir -p ~/.gnupg
-          echo "pinentry-mode loopback" > ~/.gnupg/gpg.conf
           if [[ "$GITHUB_REF" =~ ^(refs/heads/main|refs/tags/v.+)$ && "$GITHUB_REPOSITORY" = "duckdb/duckdb-java" ]] ; then
           export XML='
             <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
diff --git a/scripts/jdbc_maven_deploy.py b/scripts/jdbc_maven_deploy.py
index d4445a3d..d908e3f3 100644
--- a/scripts/jdbc_maven_deploy.py
+++ b/scripts/jdbc_maven_deploy.py
@@ -182,7 +182,7 @@ def exec(cmd):
     shutil.copyfile(jar, os.path.join(results_dir, os.path.basename(jar)))
 
 print("JARs created, uploading (this can take a while!)")
-deploy_cmd_prefix = 'mvn gpg:sign-and-deploy-file -Durl=%s -DrepositoryId=ossrh' % deploy_url
+deploy_cmd_prefix = 'mvn gpg:sign-and-deploy-file -DgpgArguments=--batch,--pinentry-mode,loopback -Durl=%s -DrepositoryId=ossrh' % deploy_url
 exec("%s -DpomFile=%s -Dfile=%s" % (deploy_cmd_prefix, pom, binary_jar))
 exec("%s -Dclassifier=sources -DpomFile=%s -Dfile=%s" % (deploy_cmd_prefix, pom, sources_jar))
 exec("%s -Dclassifier=javadoc -DpomFile=%s -Dfile=%s" % (deploy_cmd_prefix, pom, javadoc_jar))