Fixed merge-publish and disabled circleci publish workflow

.circleci/config.yml

@@ -202,36 +202,36 @@ workflows:
           context:
             - hypertrace-vulnerability-scanning
             - dockerhub-read
-      - merge-publish:
-          context:
-            - hypertrace-publishing
-            - dockerhub-read
-          requires:
-            - build
-            - integration-test
-            - validate-charts
-            - snyk-scan
-          filters:
-            branches:
-              only:
-                - main
-      - release-publish:
-          context:
-            - hypertrace-publishing
-            - dockerhub-read
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /^release-.*/
-      - release-charts:
-          context:
-            - hypertrace-publishing
-            - dockerhub-read
-          requires:
-            - release-publish
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /^release-.*/
+      # - merge-publish:
+      #     context:
+      #       - hypertrace-publishing
+      #       - dockerhub-read
+      #     requires:
+      #       - build
+      #       - integration-test
+      #       - validate-charts
+      #       - snyk-scan
+      #     filters:
+      #       branches:
+      #         only:
+      #           - main
+      # - release-publish:
+      #     context:
+      #       - hypertrace-publishing
+      #       - dockerhub-read
+      #     filters:
+      #       branches:
+      #         ignore: /.*/
+      #       tags:
+      #         only: /^release-.*/
+      # - release-charts:
+      #     context:
+      #       - hypertrace-publishing
+      #       - dockerhub-read
+      #     requires:
+      #       - release-publish
+      #     filters:
+      #       branches:
+      #         ignore: /.*/
+      #       tags:
+      #         only: /^release-.*/

.github/workflows/pr-build.yml

@@ -3,7 +3,9 @@ on:
   push:
     branches:
       - main
+    # adding PR closed event to PR to facilitate merge-publish. [https://docs.github.com/en/free-pro-team@latest/actions/reference/events-that-trigger-workflows#pull_request]
   pull_request:
+    types: [assigned, opened, synchronize, reopened, closed]
   pull_request_target:
 
 jobs:
@@ -61,8 +63,42 @@ jobs:
           flags: integration
 
       - name: push docker image
-        if: github.event.pull_request.merged
+         # https://docs.github.com/en/free-pro-team@latest/developers/webhooks-and-events/webhook-events-and-payloads#pull_request
+        if: github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true
         run: ./gradlew dockerPushImages
 
+  validate-helm-charts:
+    runs-on: ubuntu-20.04
+    container: 
+      image: hypertrace/helm-gcs-packager:0.3.0
+      credentials:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+     # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2.3.4
+        with:
+          fetch-depth: 0
 
-
+      - name: validate charts
+        run: |
+          helm dependency update ./helm/
+          helm lint --strict ./helm/
+          helm template ./helm/
+
+  snyk-scan:
+    runs-on: ubuntu-20.04
+    steps:
+    # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
+    - name: Checkout Repository
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - name: Run Snyk to check for vulnerabilities
+      uses: snyk/actions/gradle-jdk11@0.3.0
+      env:
+        SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
+      with:
+        args: --all-sub-projects --policy-path=.snyk --configuration-matching='^runtimeClasspath$'

.github/workflows/publish.yml

@@ -51,12 +51,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}       
 
       - name: package and release charts
         env: