From 94e6f02e2a675f1adeff4a9b94c71e1368dab48f Mon Sep 17 00:00:00 2001
From: Mykhailo Kuznietsov <mkuznets@redhat.com>
Date: Wed, 9 Jun 2021 12:32:36 +0300
Subject: [PATCH] ci: Use proper che-server directory name in the release
 process (#19)

Signed-off-by: Mykhailo Kuznietsov <mkuznets@redhat.com>
---
 .github/workflows/release.yml |  4 ++--
 make-release.sh               | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 10461c0335..aa256083af 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -47,7 +47,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with: 
-          path: che
+          path: che-server
           fetch-depth: 0
       - uses: actions/checkout@v2
         if: ${{ github.event.inputs.releaseParent == 'true' }}
@@ -128,7 +128,7 @@ jobs:
           set -e
           # determine which OS we're using: rhel or ubuntu
           cat /etc/os-release || true
-          ./che/make-release.sh
+          ./che-server/make-release.sh
       - name: Create GH Release
         id: create_release
         uses: ncipollo/release-action@v1.8.0
diff --git a/make-release.sh b/make-release.sh
index febbbfcede..ad3dabe188 100755
--- a/make-release.sh
+++ b/make-release.sh
@@ -8,11 +8,11 @@ ORGANIZATION="eclipse"
 
  # KEEP RIGHT ORDER!!!
 DOCKER_FILES_LOCATIONS=(
-    che/dockerfiles/endpoint-watcher
-    che/dockerfiles/keycloak
-    che/dockerfiles/postgres
-    che/dockerfiles/dev
-    che/dockerfiles/che
+    che-server/dockerfiles/endpoint-watcher
+    che-server/dockerfiles/keycloak
+    che-server/dockerfiles/postgres
+    che-server/dockerfiles/dev
+    che-server/dockerfiles/che
 )
 
 IMAGES_LIST=(
@@ -113,7 +113,7 @@ checkoutTags() {
         git checkout ${CHE_VERSION}
         cd ..
     fi
-    cd che
+    cd che-server
     git checkout ${CHE_VERSION}
     cd ..
 }
@@ -169,7 +169,7 @@ createTags() {
     if [[ $RELEASE_CHE_PARENT = "true" ]]; then
         tagAndCommit che-parent
     fi
-    tagAndCommit che
+    tagAndCommit che-server
 }
 
 tagAndCommit() {
@@ -203,7 +203,7 @@ prepareRelease() {
         echo "[INFO] Che Parent version has been updated to ${VERSION_CHE_PARENT}"
     fi
 
-    pushd che >/dev/null
+    pushd che-server >/dev/null
         if [[ $RELEASE_CHE_PARENT = "true" ]]; then
             mvn versions:update-parent -DgenerateBackupPoms=false -DallowSnapshots=false -DparentVersion=[${VERSION_CHE_PARENT}]
         fi
@@ -256,7 +256,7 @@ releaseCheServer() {
         popd >/dev/null
     fi
 
-    pushd che >/dev/null
+    pushd che-server >/dev/null
     rm -f $tmpmvnlog || true
     set +e
     mvn clean install -U -Pcodenvy-release -Dgpg.passphrase=$CHE_OSS_SONATYPE_PASSPHRASE | tee $tmpmvnlog
@@ -366,7 +366,7 @@ bumpVersion() {
         popd >/dev/null
     fi
 
-    pushd che >/dev/null
+    pushd che-server >/dev/null
         git checkout $2
         if [[ $RELEASE_CHE_PARENT = "true" ]]; then
             mvn versions:update-parent -DgenerateBackupPoms=false -DallowSnapshots=true -DparentVersion=[${VERSION_CHE_PARENT}]
@@ -384,7 +384,7 @@ bumpVersion() {
 }
 
 updateImageTagsInCheServer() {
-    cd che
+    cd che-server
     git checkout ${BRANCH}
     cd .ci
     ./set_tag_version_images.sh ${CHE_VERSION}