From 9893331215650fe55989e1b0a492f9588fc5573e Mon Sep 17 00:00:00 2001
From: aboyko <aboyko@vmware.com>
Date: Wed, 1 Feb 2023 16:17:01 -0500
Subject: [PATCH] Build pre-release vsix without the timestamp

---
 concourse/pipeline.yml                     |  7 +----
 concourse/tasks/build-vsix-pre-release.sh  | 36 ++++++++++++++++++++++
 concourse/tasks/build-vsix-pre-release.yml | 14 +++++++++
 concourse/tasks/build-vsix.sh              |  2 +-
 4 files changed, 52 insertions(+), 7 deletions(-)
 create mode 100755 concourse/tasks/build-vsix-pre-release.sh
 create mode 100644 concourse/tasks/build-vsix-pre-release.yml

diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml
index 536239c0a..23e574dab 100644
--- a/concourse/pipeline.yml
+++ b/concourse/pipeline.yml
@@ -512,7 +512,7 @@ jobs:
       trigger: true
     - get: maven-cache
   - task: build-manifest-yaml-vsix-snapshot
-    file: sts4/concourse/tasks/build-vsix.yml
+    file: sts4/concourse/tasks/build-vsix-pre-release.yml
     params:
       extension_id: vscode-manifest-yaml
     on_failure:
@@ -532,11 +532,6 @@ jobs:
       params:
         text: |
            Pre-Release Publishing for ${BUILD_PIPELINE_NAME}/${BUILD_JOB_NAME}/${BUILD_NAME} has failed!      
-  - in_parallel:
-    - put: s3-manifest-yaml-vsix-snapshot
-      params: 
-        file: out/vscode-manifest-yaml-*.vsix
-        acl: public-read
 - name: build-spring-boot-vsix-snapshot
   plan:
   - in_parallel:
diff --git a/concourse/tasks/build-vsix-pre-release.sh b/concourse/tasks/build-vsix-pre-release.sh
new file mode 100755
index 000000000..f2c91771f
--- /dev/null
+++ b/concourse/tasks/build-vsix-pre-release.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+set -e
+workdir=`pwd`
+sources=$workdir/sts4/vscode-extensions/$extension_id
+server_id=${extension_id#vscode-}
+
+if [ -d "maven-cache" ]; then
+    echo "Prepopulating maven cache"
+    tar xzf maven-cache/*.tar.gz -C ${HOME}
+else
+   echo "!!!No stored maven cache found!!! "
+   echo "!!!This may slow down the build!!!"
+fi
+
+#cd ${sources}/../commons-vscode
+#npm install
+
+cd "$sources"
+
+#npm install ../commons-vscode
+
+timestamp=`date -u +%Y%m%d%H%M`
+
+version=`jq -r .version package.json`
+echo -e "\n\n*Version: ${version}-PRE-RELEASE*" >> README.md
+
+./scripts/preinstall.sh
+npm install
+#npm audit
+npm run vsce-pre-release-package
+
+cp *.vsix $workdir/out
+server_jar=$workdir/sts4/headless-services/${server_id}-language-server/target/*-exec.jar
+if [ -f $server_jar ]; then
+    cp $server_jar $workdir/out/${server_id}-language-server-${version}-${timestamp}.jar
+fi
diff --git a/concourse/tasks/build-vsix-pre-release.yml b/concourse/tasks/build-vsix-pre-release.yml
new file mode 100644
index 000000000..19766fab3
--- /dev/null
+++ b/concourse/tasks/build-vsix-pre-release.yml
@@ -0,0 +1,14 @@
+inputs:
+- name: sts4
+- name: maven-cache
+outputs:
+- name: out
+platform: linux
+image_resource:
+  type: registry-image
+  source:
+    username: ((docker_hub_username))
+    password: ((docker_hub_password))
+    repository: springci/sts4-build-env
+run:
+  path: sts4/concourse/tasks/build-vsix-pre-release.sh
diff --git a/concourse/tasks/build-vsix.sh b/concourse/tasks/build-vsix.sh
index c078809fc..bcf13beb8 100755
--- a/concourse/tasks/build-vsix.sh
+++ b/concourse/tasks/build-vsix.sh
@@ -34,7 +34,7 @@ fi
 ./scripts/preinstall.sh
 npm install
 #npm audit
-npm run vsce-pre-release-package
+npm run vsce-release-package
 
 # for release build we don't don't add version-qualifier to package.json
 # So we must instead rename the file ourself to add a qualifier