From 35a7d90b359afa6238afc6aaac16aa5794a7c761 Mon Sep 17 00:00:00 2001
From: aboyko <aboyko@vmware.com>
Date: Thu, 8 Jun 2023 09:37:45 -0400
Subject: [PATCH] Properly pass env vars with gpg data to maven

---
 .github/workflows/eclipse-ls-extensions.yml | 6 +++---
 eclipse-language-servers/pom.xml            | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/eclipse-ls-extensions.yml b/.github/workflows/eclipse-ls-extensions.yml
index 2f041ed84..932e646c6 100644
--- a/.github/workflows/eclipse-ls-extensions.yml
+++ b/.github/workflows/eclipse-ls-extensions.yml
@@ -33,9 +33,9 @@ jobs:
         env:
           tools_s3_access_key: ${{ secrets.TOOLS_S3_ACCESS_KEY }}
           tools_s3_secret_key: ${{ secrets.TOOLS_S3_SECRET_KEY  }}
-          gpg.passphrase: ${{ secrets.GPG_PASSPHRASE }}
-          gpg.keyname: ${{ secrets.GPG_KEYID }}
-          gpg.homedir: '~/gpg-keyring'
+          gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
+          gpg_keyname: ${{ secrets.GPG_KEYID }}
+          gpg_homedir: '~/gpg-keyring'
         run: |
           cd eclipse-language-servers
           xvfb-run mvn --batch-mode clean deploy -Pe427 -Psnapshot -Pgitactions -DbuildNumber=${{ steps.timestamp.outputs.timestamp }} -Dsigning.skip=true -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Ds3service.https-only=true -Dmaven.test.skip=true -Dtycho.localArtifacts=ignore
\ No newline at end of file
diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml
index bb099ab3b..cc26bd416 100644
--- a/eclipse-language-servers/pom.xml
+++ b/eclipse-language-servers/pom.xml
@@ -137,6 +137,10 @@
 				<dist.pathpostfix>trials</dist.pathpostfix>
 				<dist.path>${dist.type}/${dist.key}/${dist.project}/${dist.pathpostfix}</dist.path>
 				<sts4-language-servers-p2-repo>https://dist.springsource.com/${dist.type}/TOOLS/trials/sts4-language-server-integrations/${sts4-language-servers-version}</sts4-language-servers-p2-repo>
+
+				<gpg.passphrase>${env.gpg_passphrase}</gpg.passphrase>
+				<gpg.keyname>${env.gpg_keyname}</gpg.keyname>
+				<gpg.homedir>${env.gpg_homedir}</gpg.homedir>
 			</properties>
 		</profile>