From 91163b0c2bd04e18dd61b4049c365d9a1aad6a7c Mon Sep 17 00:00:00 2001
From: aboyko <aboyko@vmware.com>
Date: Thu, 6 Jul 2023 12:41:53 -0400
Subject: [PATCH] Try to use re-usable workflow to build eclipse distros

---
 .../current-eclipse-distro-build.yml          | 20 ++++++++++
 .../current-eclipse-release-distro.yml        | 39 -------------------
 2 files changed, 20 insertions(+), 39 deletions(-)
 create mode 100644 .github/workflows/current-eclipse-distro-build.yml
 delete mode 100644 .github/workflows/current-eclipse-release-distro.yml

diff --git a/.github/workflows/current-eclipse-distro-build.yml b/.github/workflows/current-eclipse-distro-build.yml
new file mode 100644
index 000000000..6631dd33c
--- /dev/null
+++ b/.github/workflows/current-eclipse-distro-build.yml
@@ -0,0 +1,20 @@
+name: Current Eclipse STS4 Distribution
+
+# configure manual trigger
+on:
+  workflow_dispatch:
+#on:
+#  push:
+#    branches:
+#      - 'main'
+
+jobs:
+
+  eclipse-language-servers-build:
+    runs-on: macos-latest
+    steps:
+      - name: Eclipse 4.28 Distro Build
+        uses: ./eclipse-distro-build.yml
+        with:
+          eclipse_profile: 'e428'
+          build_type: 'snapshot'
\ No newline at end of file
diff --git a/.github/workflows/current-eclipse-release-distro.yml b/.github/workflows/current-eclipse-release-distro.yml
deleted file mode 100644
index 4cda61167..000000000
--- a/.github/workflows/current-eclipse-release-distro.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-name: Current Eclipse Release STS4 Distribution
-
-# configure manual trigger
-on:
-  workflow_dispatch:
-#on:
-#  push:
-#    branches:
-#      - 'main'
-
-jobs:
-
-  eclipse-language-servers-build:
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
-      - name: Set up JDK 17
-        uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-      - name: Enforce https instead of http
-        run: ./nohttp.sh
-      - name: Timestamp
-        id: timestamp
-        run: echo "name=date::$(date +'%Y%m%dT%H%M%S')" >> $GITHUB_OUTPUT
-      - name: Install GPG key
-        run: |
-          echo "${{ secrets.GPG_PRIVATE_KEY }}" > gpg.asc
-          echo "${{ secrets.GPG_PASSPHRASE }}" | gpg --batch --yes --passphrase-fd 0 --import gpg.asc
-      - name: Build Eclipse Distro
-        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 -Pe428 -Psnapshot -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