From 3fb358bccc80568f7fa857d6ec371f084f2516da Mon Sep 17 00:00:00 2001
From: aboyko <aboyko@vmware.com>
Date: Thu, 20 Jul 2023 10:12:16 -0400
Subject: [PATCH] GHA: correct sign exe script support linux and mac with ls
 ext build job

---
 .github/scripts/sign-exe.sh                   |  2 +-
 .../workflows/eclipse-ls-extensions-build.yml | 20 +++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.github/scripts/sign-exe.sh b/.github/scripts/sign-exe.sh
index 50b810423..078dbe00c 100755
--- a/.github/scripts/sign-exe.sh
+++ b/.github/scripts/sign-exe.sh
@@ -10,6 +10,6 @@ ssh -i $SSH_KEY $SSH_USER@vm-tools.spring.vmware.com -- /build/apps/signing/sign
 echo "Copying **signed** $in_filename back... (into $out_file)"
 scp -i $SSH_KEY $SSH_USER@vm-tools.spring.vmware.com:/opt/bamboo/$in_filename $out_file
 echo "Cleaning up remote machine..."
-ssh -i $SSH_KEY $SSH_USER@vm-tools.spring.vmware.com -- rm /opt/bamboo/$in_filename
+ssh -i $SSH_KEY $SSH_USER@vm-tools.spring.vmware.com -- rm -f /opt/bamboo/$in_filename
 echo "Successfully signed $in_filename"
 
diff --git a/.github/workflows/eclipse-ls-extensions-build.yml b/.github/workflows/eclipse-ls-extensions-build.yml
index a9121692a..9b2d96630 100644
--- a/.github/workflows/eclipse-ls-extensions-build.yml
+++ b/.github/workflows/eclipse-ls-extensions-build.yml
@@ -11,7 +11,7 @@ on:
 jobs:
 
   eclipse-language-servers-build:
-    runs-on: ubuntu-latest
+    runs-on: macos-latest-xl
     steps:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
         with:
@@ -31,7 +31,11 @@ jobs:
       - name: Build Language Servers JARs
         run: |
           cd headless-services
-          xvfb-run ./mvnw --batch-mode clean install
+          if command -v xvfb-run ; then
+            xvfb-run ./mvnw --batch-mode clean install
+          else
+            ./mvnw --batch-mode clean install
+          fi
       - name: Install GPG key
         run: |
           echo "${{ secrets.GPG_PRIVATE_KEY }}" > gpg.asc
@@ -44,8 +48,16 @@ jobs:
           gpg_keyname: ${{ secrets.GPG_KEYID }}
         run: |
           cd eclipse-language-servers
-          xvfb-run ./mvnw --batch-mode clean deploy -Pe428 -Psnapshot -Pgitactions -Pgpg.sign -DbuildNumber=${{ steps.timestamp.outputs.date }} -Dsigning.skip=true -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Ds3service.https-only=true -Dmaven.test.skip=true -Dtycho.localArtifacts=ignore
+          if command -v xvfb-run ; then
+            xvfb-run ./mvnw --batch-mode clean deploy -Pe428 -Psnapshot -Pgitactions -Pgpg.sign -DbuildNumber=${{ steps.timestamp.outputs.date }} -Dsigning.skip=true -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Ds3service.https-only=true -Dmaven.test.skip=true -Dtycho.localArtifacts=ignore
+          else
+            ./mvnw --batch-mode clean deploy -Pe428 -Psnapshot -Pgitactions -Pgpg.sign -DbuildNumber=${{ steps.timestamp.outputs.date }} -Dsigning.skip=true -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Ds3service.https-only=true -Dmaven.test.skip=true -Dtycho.localArtifacts=ignore
+          fi
       - name: Verify Eclipse LS Extensions on e429
         run: |
           cd eclipse-language-servers
-          xvfb-run ./mvnw --batch-mode clean package -Pe429 -Psnapshot -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
+          if command -v xvfb-run ; then
+            xvfb-run ./mvnw --batch-mode clean package -Pe429 -Psnapshot -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
+          else
+            ./mvnw --batch-mode clean package -Pe429 -Psnapshot -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
+          fi