chore: Remove DevWorkspace Generator from devfile registry (#829)

* chore: Remove DevWorkspace Generator from devfile registry

Signed-off-by: Anatolii Bazko <[email protected]>

build.sh

@@ -10,8 +10,6 @@
 
 set -e
 
-base_dir=$(cd "$(dirname "$0")"; pwd)
-
 REGISTRY="quay.io"
 ORGANIZATION="eclipse"
 TAG="next"
@@ -73,10 +71,6 @@ function parse_arguments() {
 
 parse_arguments "$@"
 
-echo "Build tooling..."
-pushd "${base_dir}"/tools/devworkspace-generator > /dev/null
-yarn
-
 BUILD_COMMAND="build"
 if [[ -z $BUILDER ]]; then
     echo "BUILDER not specified, trying with podman"
@@ -108,8 +102,6 @@ else
     fi
 fi
 
-pushd "${base_dir}" > /dev/null
-
 IMAGE="${REGISTRY}/${ORGANIZATION}/che-devfile-registry:${TAG}"
 VERSION=$(head -n 1 VERSION)
 ${BUILDER} ${BUILD_COMMAND} \

build/scripts/generate_devworkspace_templates.sh

@@ -17,40 +17,43 @@ if [[ -z "$VERSION" || "$VERSION" == *"-next" ]]; then
   VERSION="main"
 fi
 
-CHE_DEVWORKSPACE_GENERATOR_VERSION=next
 PLUGIN_REGISTRY_URL=https://eclipse-che.github.io/che-plugin-registry/${VERSION}/v3
 
+# Install che-devworkspace-generator
+CHE_DEVWORKSPACE_GENERATOR_VERSION=next
+npm install @eclipse-che/che-devworkspace-generator@${CHE_DEVWORKSPACE_GENERATOR_VERSION}
+
 for dir in /build/devfiles/*/
 do
   devfile_url=$(grep "v2:" "${dir}"meta.yaml) || :
   if [ -n "$devfile_url" ]; then
     devfile_url=${devfile_url##*v2: }
     devfile_url=${devfile_url%/}
     #generate a temporary devworkspace yaml to fetch git repository name and clone url.
-    npm_config_yes=true npx @eclipse-che/che-devworkspace-generator@${CHE_DEVWORKSPACE_GENERATOR_VERSION} \
+    npm_config_yes=true npx @eclipse-che/che-devworkspace-generator \
     --devfile-url:"${devfile_url}" \
     --plugin-registry-url:"${PLUGIN_REGISTRY_URL}" \
     --editor-entry:che-incubator/che-code/latest \
     --output-file:"${dir}"temp.yaml
-    
+
     name=$(yq -r '.spec.template.projects[0].name' "${dir}temp.yaml"  | sed -n '2 p')
     project="${name}={{_INTERNAL_URL_}}/resources/v2/${name}.zip"
 
-    npm_config_yes=true npx @eclipse-che/che-devworkspace-generator@${CHE_DEVWORKSPACE_GENERATOR_VERSION} \
+    npm_config_yes=true npx @eclipse-che/che-devworkspace-generator \
     --devfile-url:"${devfile_url}" \
     --editor-entry:che-incubator/che-code/insiders \
     --plugin-registry-url:"${PLUGIN_REGISTRY_URL}" \
     --output-file:"${dir}"/devworkspace-che-code-insiders.yaml \
     --project."${project}"
 
-    npm_config_yes=true npx @eclipse-che/che-devworkspace-generator@${CHE_DEVWORKSPACE_GENERATOR_VERSION} \
+    npm_config_yes=true npx @eclipse-che/che-devworkspace-generator \
     --devfile-url:"${devfile_url}" \
     --editor-entry:che-incubator/che-code/latest \
     --plugin-registry-url:"${PLUGIN_REGISTRY_URL}" \
     --output-file:"${dir}"/devworkspace-che-code-latest.yaml \
     --project."${project}"
 
-    npm_config_yes=true npx @eclipse-che/che-devworkspace-generator@${CHE_DEVWORKSPACE_GENERATOR_VERSION} \
+    npm_config_yes=true npx @eclipse-che/che-devworkspace-generator \
     --devfile-url:"${devfile_url}" \
     --editor-entry:che-incubator/che-idea/next \
     --plugin-registry-url:"${PLUGIN_REGISTRY_URL}" \

make-release.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
-# Release process automation script. 
+# Release process automation script.
 # Used to create branch/tag, update VERSION files
-# and and trigger release by force pushing changes to the release branch 
+# and and trigger release by force pushing changes to the release branch
 
 # set to 1 to actually trigger changes in the release branch
-TRIGGER_RELEASE=0 
+TRIGGER_RELEASE=0
 NOCOMMIT=0
 TMP=""
 [email protected]:eclipse-che/che-devfile-registry
@@ -37,7 +37,7 @@ verifyContainerExistsWithTimeout()
   count=1
   (( timeout_intervals=this_timeout*3 ))
   while [[ $count -le $timeout_intervals ]]; do # echo $count
-    echo "[INFO] [$count/$timeout_intervals] Verify ${container_to_check} exists..." 
+    echo "[INFO] [$count/$timeout_intervals] Verify ${container_to_check} exists..."
     # check if the container exists
     verifyContainerExists "${container_to_check}"
 
@@ -65,7 +65,7 @@ verifyContainerExistsWithTimeout()
 # Checks the container existence
 #
 # Returns
-#   1: found; 0: not found; -1: unknown manifest 
+#   1: found; 0: not found; -1: unknown manifest
 #
 verifyContainerExists()
 {
@@ -124,7 +124,7 @@ checkRequiredImagesExist()
   done
 }
 
-performRelease() 
+performRelease()
 {
   set -xe
 
@@ -134,7 +134,7 @@ performRelease()
 
   # Build and push happy path image, which depends on the above
   ./happy-path/build_happy_path_image.sh --push --rm
-  
+
   echo "[INFO] Checking images..."
   checkRequiredImagesExist
 
@@ -170,9 +170,6 @@ updateVersion () {
   thisVERSION="$1"
   # update main VERSION file of devfile registry
   echo "${thisVERSION}" > VERSION
-  # update version of devworkspace-generator in package.json
-  jq ".\"version\" = \"${thisVERSION}\"" tools/devworkspace-generator/package.json > tools/devworkspace-generator/package.json.update
-  mv tools/devworkspace-generator/package.json.update tools/devworkspace-generator/package.json
 }
 
 if [[ ! ${VERSION} ]]; then
@@ -186,7 +183,7 @@ BRANCH=${VERSION%.*}.x
 # if doing a .0 release, use main; if doing a .z release, use $BRANCH
 if [[ ${VERSION} == *".0" ]]; then
   BASEBRANCH="main"
-else 
+else
   BASEBRANCH="${BRANCH}"
 fi
 
@@ -218,7 +215,7 @@ commitChangeOrCreatePR()
 
     if [[ ${PR_BRANCH} == *"add"* ]]; then
       COMMIT_MSG="chore: release: add ${aVERSION} plugins in ${aBRANCH}"
-    else 
+    else
       COMMIT_MSG="chore: release: bump to ${aVERSION} in ${aBRANCH}"
     fi