Create first release with github actions.

Signed-off-by: Nick Lawrence <[email protected]>

Author: ntl-ibm

.github/workflows/nlp-insights-push-validation.yml

@@ -1,6 +1,8 @@
 name: nlp-insights PUSH Validation
 on: 
   push:
+   branches-ignore:
+    - 'main'
 defaults:
   run:
     shell: bash

.github/workflows/prepare-release.yml

@@ -8,12 +8,11 @@ on:
 jobs:
   prepare-release:
     name: Prepare release
-    if: ${{ github.event.label.name != 'no-release' }}
     runs-on: ubuntu-latest
 
     env:
-      docker_server: docker.io
-      docker_org: ntlawrence
+      docker_server: quay.io
+      docker_org: alvearie
       docker_repo: nlp-insights
 
     steps:
@@ -37,15 +36,15 @@ jobs:
              if [[ "${{ github.event.label.name }}" =~ '^(release-major|release-minor|release-patch)$' ]]; then
                RELEASE="${{ github.event.label.name }}"
              elif [ -z "${{ github.event.label.name }}" ]; then
-               &>2 echo "There was no label (valid values are release-major, release-minor, or release-patch), using release-patch"
+               >&2 echo "There was no label (valid values are release-major, release-minor, or release-patch), using release-patch"
                RELEASE=release-patch
              else
-               &>2 echo "The pull request must have a label in (release-major, release-minor, or release-patch)."
+               >&2 echo "The pull request must have a label in (release-major, release-minor, or release-patch)."
                exit 1
              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 "${VERSION} was assigned as a release tag"
       - name: Update release files
         run: |
              UPDATES=0
@@ -55,7 +54,7 @@ jobs:
               --docker_org=${{ env.docker_org }} \
               --docker_repo=${{ env.docker_repo}} || UPDATES=$?
 
-             &>2 echo "${UPDATES} changes were made to update the release to ${{ env.VERSION }}"
+             >&2 echo "${UPDATES} changes were made to update the release to ${{ env.VERSION }}"
 
       - name: Unit Test
         run:  ./gradlew test
@@ -72,11 +71,27 @@ jobs:
 
       - name: Push Docker Image
         run: |
-             ./gradlew checkSource dockerPush -PdockerUser=${{ env.docker_server }}/${{ env.docker_org }}
+             ./gradlew dockerPush -PdockerUser=${{ env.docker_server }}/${{ env.docker_org }}
       - name: Commit release updates to git
         run: |
              git config user.name ${{ github.actor }}
              git config user.email "${{ github.actor }}@users.noreply.github.com"
              git add -A
              git commit --signoff -m "Update to version ${{ env.VERSION }}" || true
              git push || true #Ignore errors in case no files have changed
+
+             # The commit that we just pushed will not trigger the prepare release action (avoids recursion)
+             # So we need to explicitly tag the action complete for the commit that we
+             # just pushed. This is the last step in the flow.
+             # See: https://docs.github.com/en/rest/reference/commits#create-a-commit-status
+      - name: Signal Completion
+        run: |
+             set -x
+             BUILD_URL="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
+             sha=$(git rev-parse HEAD)
+             obj="{\"state\" : \"success\", \"context\" : \"Prepare release\", \"target_url\": \"${BUILD_URL}\" }"
+ 
+             curl -X POST "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/statuses/${sha}"  \
+                  -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
+                  -H "Accept: application/vnd.github.v3+json" \
+                  -d "${obj}"

.github/workflows/release.yml

@@ -3,8 +3,6 @@ on:
   push:
     branches:
       - main
-    paths:
-      - 'services/nlp-insights/gradle.properties'
 
 jobs:
   create-release:
@@ -17,7 +15,6 @@ jobs:
           fetch-depth: 0
       - name: Calculate Tag
         run:  echo "TAG=v$(grep -oP 'version\=\K([0-9]+\.[0-9]+\.[0-9]+)' gradle.properties)" >> $GITHUB_ENV
-        working-directory: ./services/nlp-insights
       - name: Create Release
         uses: actions/create-release@v1
         env:

.github/workflows/scripts/update_files_with_version.sh

@@ -62,7 +62,7 @@ fi
 ######
 chart_yaml=${PROJECT_DIR}/chart/Chart.yaml
 
-# tag
+# version
 last_service_helm_ver="$(grep "version:" ${chart_yaml} | sed -r 's/version: (.*)/\1/')"
 last_service_helm_ver=`echo $last_service_helm_ver | sed -e 's/^[[:space:]]*//'`
 if [[ ${last_service_helm_ver} != ${VERSION} ]]; then
@@ -71,6 +71,15 @@ if [[ ${last_service_helm_ver} != ${VERSION} ]]; then
   updates=$((updates+1))
 fi
 
+# app version
+last_app_ver="$(grep "version:" ${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}"
+  sed -i -e 's/appVersion: '${last_app_ver}'/appVersion: '${VERSION}'/' ${chart_yaml}
+  updates=$((updates+1))
+fi
+
 ## Re-package
 if [[ ${last_service_helm_ver} != ${VERSION} ]] || [[ ${last_tag} != ${VERSION} ]] ||  [[ ${last_org} != ${DOCKER_ORG} ]]; then
   PACKAGE="${PROJECT_DIR}/docs/charts"

.gitignore

@@ -1,2 +1,4 @@
 build
 .gradle
+.project
+.pydevproject

chart/Chart.yaml

@@ -15,7 +15,7 @@ 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.0
+version: 0.1.1
 
 # 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
@@ -28,8 +28,8 @@ keywords:
   - nlp
   - insights
 
-home: https://github.com/Alvearie/health-patterns/tree/main/services/nlp-insights
+home: https://github.com/LinuxForHealth/nlp-insights
 
 maintainers:
-  - name: Adam T. Clark
-    email: atclark@us.ibm.com
+  - name: Nicholas T. Lawrence
+    email: ntl@us.ibm.com

chart/values.yaml

@@ -5,9 +5,9 @@
 replicaCount: 1
 
 image:
-  repository: quay.io/alvearie/nlp-insights
+  repository: alvearie/nlp-insights
   pullPolicy: Always
-  tag: 0.0.6
+  tag: 0.1.1
   pullSecret:
 
 service: