test

s-tuli · Nov 7, 2019 · ecb1a06 · ecb1a06
1 parent c05cac2
commit ecb1a06
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/.github/workflows/bikes.yml b/.github/workflows/bikes.yml
@@ -64,15 +64,15 @@ jobs:
       id: install-helm-client
       run: |
         set -e
-        clientversion=$(echo $(helm version --client --short) | sed -n 's/.*Client: \(.*\)+.*/\1/p')   
-        #clientversion=$(helm version --client --short | cut -d' ' -f2)
+        #clientversion=$(helm version --client --short | sed -n 's/.*Client: \(.*\)+.*/\1/p')   
+        clientversion=$(helm version --client --short | cut -d' ' -f2 | cut -d'+' -f1)
         echo $clientversion
         #serverversion=$(helm version --client --short | cut -d' ' -f2)
-        serverversion=$(echo $(helm version --server --short) | sed -n 's/.*Server: \(.*\)+.*/\1/p')
+        serverversion=$(helm version --server --short | sed -n 's/.*Server: \(.*\)+.*/\1/p')
         echo $serverversion
         if [ ! -n "$serverversion" ]; then
           echo "Please install Helm on the server!" 1>&2
-          exit 64
+          exit 1
         elif [ "$clientversion" != "$serverversion" ]; then   
           echo The client and server Helm Versions are equal
           echo ::set-output name=result::
@@ -84,10 +84,12 @@ jobs:
           ./get_helm.sh
           echo ::set-output name=result::$mktemp
         fi
+        echo $mktemp
 
     - name: Helm Upgrade PR
       run: |        
-        ${{steps.install-helm-client.outputs.result}}helm upgrade --install --namespace ${{steps.generate-child-space-name.outputs.result}} ${{steps.generate-release-name.outputs.result}} samples/BikeSharingApp/Bikes/charts/bikes \
+        ${{steps.install-helm-client.outputs.result}}helm upgrade \
+        --install --namespace ${{steps.generate-child-space-name.outputs.result}} ${{steps.generate-release-name.outputs.result}} samples/BikeSharingApp/Bikes/charts/bikes \
           --set image.repository=${{ secrets.CONTAINER_REGISTRY }}/bikes \
           --set image.tag=$GITHUB_SHA \
           --set imagePullSecrets[0].name=${{ secrets.IMAGE_PULL_SECRET }}