Merge pull request #5 from LinuxForHealth/merge_actions

Fix problem with updating release files

Author: ntl-ibm

.github/workflows/prepare-release.yml

@@ -44,15 +44,15 @@ jobs:
              fi
 
              echo "VERSION=$(calculate_tag ${{ env.docker_repo }} ${{ env.docker_server }} ${{ env.docker_org }} ${RELEASE} )" >> $GITHUB_ENV
-             >&2 echo "${VERSION} was assigned as a release tag"
+             >&2 echo "${{ env.version }} was assigned as a release tag"
       - name: Update release files
         run: |
-             UPDATES=0
-             .github/workflows/scripts/update_files_with_version.sh \
+             set -ex
+             UPDATES=$(.github/workflows/scripts/update_files_with_version.sh \
               --project_dir=. \
               --version=${{ env.VERSION }} \
               --docker_org=${{ env.docker_org }} \
-              --docker_repo=${{ env.docker_repo}} || UPDATES=$?
+              --docker_repo=${{ env.docker_repo}})
 
              >&2 echo "${UPDATES} changes were made to update the release to ${{ env.VERSION }}"
 

.github/workflows/scripts/update_files_with_version.sh

@@ -72,7 +72,7 @@ if [[ ${last_service_helm_ver} != ${VERSION} ]]; then
 fi
 
 # app version
-last_app_ver="$(grep "version:" ${chart_yaml} | sed -r 's/appVersion: (.*)/\1/')"
+last_app_ver="$(grep "appVersion:" ${chart_yaml} | sed -r 's/appVersion: (.*)/\1/')"
 last_app_ver=`echo $last_app_ver | sed -e 's/^[[:space:]]*//'`
 if [[ ${last_app_ver} != ${VERSION} ]]; then
   >&2 echo "Updating ${chart_yaml} appVersion to version ${VERSION}"
@@ -104,5 +104,5 @@ if [[ ${last_gradle_tag} != ${VERSION} ]]; then
   updates=$((updates+1))
 fi
 
-
-exit $((updates))
+echo $updates
+exit 0 

chart/Chart.yaml

@@ -15,12 +15,12 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.1
+version: 0.1.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 0.0.1
+appVersion: 0.1.2
 
 keywords:
   - ibm

chart/values.yaml

@@ -7,7 +7,7 @@ replicaCount: 1
 image:
   repository: alvearie/nlp-insights
   pullPolicy: Always
-  tag: 0.1.1
+  tag: 0.1.2
   pullSecret:
 
 service: