From 153aad3f36c5dc68142d37bb4b4935fd309ccd5c Mon Sep 17 00:00:00 2001
From: aboyko <aboyko@vmware.com>
Date: Thu, 6 Jul 2023 13:17:10 -0400
Subject: [PATCH] Pass secrets to composite action via env vars

---
 .github/actions/eclipse-distro-build/action.yml | 5 -----
 .github/workflows/eclipse-distro-build.yml      | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/actions/eclipse-distro-build/action.yml b/.github/actions/eclipse-distro-build/action.yml
index 0c7468c4f..4cb8237d9 100644
--- a/.github/actions/eclipse-distro-build/action.yml
+++ b/.github/actions/eclipse-distro-build/action.yml
@@ -27,11 +27,6 @@ runs:
         echo "${{ secrets.GPG_PASSPHRASE }}" | gpg --batch --yes --passphrase-fd 0 --import gpg.asc
     - name: Build Eclipse Distro
       shell: bash
-      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 }}
       run: |
         cd eclipse-distribution
         mvn --batch-mode -U clean deploy -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} -Pgitactions -Pgpg.sign -DbuildQualifier=${{ steps.timestamp.outputs.date }} -Dsigning.skip=true -Dmaven.repo.local=~/.m2/repository-signed -Dhttpclient.retry-max=20 -Dmaven.test.skip=true -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore -Ds3service.https-only=true -Dp2.replaceQualifier=true -Dorg.eclipse.ecf.provider.filetransfer.httpclient.retrieve.readTimeout=1200000 -Dorg.eclipse.equinox.p2.transport.ecf.retry=5 -Dskip.eclipserun.proxies=false -Dskip.osx.signing=false  -Dskip.win.signing=false -Dskip.osx.notarizing=false -Dtycho.equinox.resolver.uses=true
\ No newline at end of file
diff --git a/.github/workflows/eclipse-distro-build.yml b/.github/workflows/eclipse-distro-build.yml
index a3caed205..faeede7be 100644
--- a/.github/workflows/eclipse-distro-build.yml
+++ b/.github/workflows/eclipse-distro-build.yml
@@ -27,6 +27,11 @@ jobs:
         with:
           eclipse_profile: ${{ inputs.eclipse_profile }}
           build_type: ${{ inputs.build_type }}
+        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 }}
 #      - name: Enforce https instead of http
 #        run: ./nohttp.sh
 #      - name: Timestamp