From 251aed2d566dc3cb7116accd8ad5e8be040cb21b Mon Sep 17 00:00:00 2001
From: Jayesh Bapu Ahire <jayeshbahire@programmer.net>
Date: Fri, 18 Dec 2020 14:53:30 +0530
Subject: [PATCH 01/10] addressed ronak's comments, fixed merge-publish and
 disabled circlec merge & publish

---
 .circleci/config.yml                  | 66 +++++++++++++--------------
 .github/workflows/pr-build.yml        | 38 ++++++++++++++-
 .github/workflows/publish.yml         |  6 ---
 .github/workflows/snyk.yml            | 25 ----------
 .github/workflows/validate_charts.yml | 29 ------------
 5 files changed, 69 insertions(+), 95 deletions(-)
 delete mode 100644 .github/workflows/snyk.yml
 delete mode 100644 .github/workflows/validate_charts.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index caa7a9db..f8910101 100644
--- a/.circleci/config.yml
+++ b/.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-.*/
diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
index 9f7eb085..dbaf2824 100644
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/pr-build.yml
@@ -61,8 +61,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$'
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index ede6cc77..6bd3addc 100644
--- a/.github/workflows/publish.yml
+++ b/.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:
diff --git a/.github/workflows/snyk.yml b/.github/workflows/snyk.yml
deleted file mode 100644
index 8ffefb27..00000000
--- a/.github/workflows/snyk.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# ref: https://github.com/snyk/actions/tree/master/gradle-jdk11
-name: snyk for gradle
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-  pull_request_target:
-  
-jobs:
-  security:
-    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$'
\ No newline at end of file
diff --git a/.github/workflows/validate_charts.yml b/.github/workflows/validate_charts.yml
deleted file mode 100644
index 1919f5d5..00000000
--- a/.github/workflows/validate_charts.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: validate charts
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-  pull_request_target:
-
-jobs:
-  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/
-        
\ No newline at end of file

From c408a74d4436ef36d8150454ef0a06567ec5b602 Mon Sep 17 00:00:00 2001
From: Jayesh Bapu Ahire <jayeshbahire@programmer.net>
Date: Fri, 18 Dec 2020 15:20:11 +0530
Subject: [PATCH 02/10] cleanup

---
 .github/workflows/pr-build.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
index dbaf2824..55302532 100644
--- a/.github/workflows/pr-build.yml
+++ b/.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:

From 3ee1a1adba3336c127a60f46be245a7d92cb8f7d Mon Sep 17 00:00:00 2001
From: Jayesh Bapu Ahire <jayeshbahire@programmer.net>
Date: Mon, 21 Dec 2020 16:54:11 +0530
Subject: [PATCH 03/10] addressed workflow split discussion

---
 .github/workflows/merge-publish.yml | 45 +++++++++++++++++++++
 .github/workflows/pr-build.yml      | 61 +++++++++--------------------
 .github/workflows/pr-test.yml       | 52 ++++++++++++++++++++++++
 .github/workflows/publish.yml       |  2 +-
 4 files changed, 117 insertions(+), 43 deletions(-)
 create mode 100644 .github/workflows/merge-publish.yml
 create mode 100644 .github/workflows/pr-test.yml

diff --git a/.github/workflows/merge-publish.yml b/.github/workflows/merge-publish.yml
new file mode 100644
index 00000000..f7371a63
--- /dev/null
+++ b/.github/workflows/merge-publish.yml
@@ -0,0 +1,45 @@
+name: build
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    steps:
+       # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
+      - name: Check out code
+        uses: actions/checkout@v2.3.4
+        with:
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
+          fetch-depth: 0
+      
+      - name: create checksum file
+        run: find . -type f -name "*.gradle*" -o -name "gradle-wrapper*" | xargs shasum | sort > checksum.txt && cat checksum.txt
+
+      - name: Cache packages
+        id: cache-packages
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle
+          key: gradle-packages-${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/checksum.txt') }}
+          restore-keys: |
+            gradle-packages-${{ runner.os }}-${{ github.job }}
+            gradle-packages-${{ runner.os }}
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+        
+      - name: branch name tag
+        run: | 
+	        GHA_BRANCH="${GITHUB_REF#refs/heads/}"
+	        echo "GHA_BRANCH=${BRANCH}" >> $GITHUB_ENV
+
+      - name: push docker image
+        run: ./gradlew dockerPushImages
\ No newline at end of file
diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
index 55302532..c4b4de3e 100644
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/pr-build.yml
@@ -1,21 +1,21 @@
-name: build and test
+name: build
 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:
-  build-and-test:
+  build:
     runs-on: ubuntu-20.04
     steps:
        # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
       - name: Check out code
         uses: actions/checkout@v2.3.4
         with:
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
           fetch-depth: 0
       
       - name: create checksum file
@@ -40,33 +40,6 @@ jobs:
       - name: Build with Gradle
         run: ./gradlew build dockerBuildImages
 
-      - name: Unit test
-        run: ./gradlew jacocoTestReport
-
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v1
-        with:
-          name: codecov-line-smoothing
-          fail_ci_if_error: true
-          verbose: true
-          flags: unit
-
-      - name: Integration test
-        run: ./gradlew jacocoIntegrationTestReport
-
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v1
-        with:
-          name: codecov-line-smoothing
-          fail_ci_if_error: true
-          verbose: true
-          flags: integration
-
-      - name: push docker image
-         # 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: 
@@ -79,6 +52,8 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v2.3.4
         with:
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
           fetch-depth: 0
 
       - name: validate charts
@@ -91,14 +66,16 @@ jobs:
     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: Check out code
+        uses: actions/checkout@v2.3.4
+        with:
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
+          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$'
+      - 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$'
diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml
new file mode 100644
index 00000000..50fff33d
--- /dev/null
+++ b/.github/workflows/pr-test.yml
@@ -0,0 +1,52 @@
+name: test
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+
+jobs:
+  test:
+    runs-on: ubuntu-20.04
+    steps:
+       # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
+      - name: Check out code
+        uses: actions/checkout@v2.3.4
+        with:
+          fetch-depth: 0
+      
+      - name: create checksum file
+        run: find . -type f -name "*.gradle*" -o -name "gradle-wrapper*" | xargs shasum | sort > checksum.txt && cat checksum.txt
+
+      - name: Cache packages
+        id: cache-packages
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle
+          key: gradle-packages-${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/checksum.txt') }}
+          restore-keys: |
+            gradle-packages-${{ runner.os }}-${{ github.job }}
+            gradle-packages-${{ runner.os }}
+
+      - name: Unit test
+        run: ./gradlew jacocoTestReport
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v1
+        with:
+          name: codecov-line-smoothing
+          fail_ci_if_error: true
+          verbose: true
+          flags: unit
+
+      - name: Integration test
+        run: ./gradlew jacocoIntegrationTestReport
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v1
+        with:
+          name: codecov-line-smoothing
+          fail_ci_if_error: true
+          verbose: true
+          flags: integration
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 6bd3addc..dfa14b56 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -58,7 +58,7 @@ jobs:
           HELM_GCS_REPOSITORY: ${{ secrets.HELM_GCS_REPOSITORY }}
             # GITHUB_REF will be refs/tags/docker-MAJOR.MINOR.PATCH
         run: |
-            CHART_VERSION=$(git describe --abbrev=0)
+            CHART_VERSION=$(echo ${GITHUB_REF} | cut -d/ -f 3)
             CHART_NAME=$(awk '/^name:/ {print $2}' ./helm/Chart.yaml)
             export GOOGLE_APPLICATION_CREDENTIALS=${HOME}/helm-gcs-key.json
             echo $HELM_GCS_CREDENTIALS > ${GOOGLE_APPLICATION_CREDENTIALS}

From 4be0b7fe70a5b0c0c3ccb4ab97f82a2661afeb59 Mon Sep 17 00:00:00 2001
From: Jayesh Bapu Ahire <jayeshbahire@programmer.net>
Date: Mon, 21 Dec 2020 16:55:05 +0530
Subject: [PATCH 04/10] renames workflow

---
 .github/workflows/merge-publish.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/merge-publish.yml b/.github/workflows/merge-publish.yml
index f7371a63..87d66906 100644
--- a/.github/workflows/merge-publish.yml
+++ b/.github/workflows/merge-publish.yml
@@ -1,4 +1,4 @@
-name: build
+name: merge-publish
 on:
   push:
     branches:
@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  merge-publish:
     runs-on: ubuntu-20.04
     steps:
        # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation

From 411a1e3e9491045b05e5bae8ad696902808c1b7f Mon Sep 17 00:00:00 2001
From: Jayesh Bapu Ahire <jayeshbahire@programmer.net>
Date: Mon, 21 Dec 2020 16:56:52 +0530
Subject: [PATCH 05/10] syntax error

---
 .github/workflows/merge-publish.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/merge-publish.yml b/.github/workflows/merge-publish.yml
index 87d66906..47254cbc 100644
--- a/.github/workflows/merge-publish.yml
+++ b/.github/workflows/merge-publish.yml
@@ -38,8 +38,8 @@ jobs:
         
       - name: branch name tag
         run: | 
-	        GHA_BRANCH="${GITHUB_REF#refs/heads/}"
-	        echo "GHA_BRANCH=${BRANCH}" >> $GITHUB_ENV
+          BRANCH="${GITHUB_REF#refs/heads/}"
+          echo "BRANCH=${BRANCH}" >> $GITHUB_ENV
 
       - name: push docker image
         run: ./gradlew dockerPushImages
\ No newline at end of file

From c5d0518646b50015792d051a071d520675ab35f7 Mon Sep 17 00:00:00 2001
From: Jayesh Bapu Ahire <jayeshbahire@programmer.net>
Date: Mon, 21 Dec 2020 22:01:43 +0530
Subject: [PATCH 06/10] addressed Aaron's comments

---
 .github/workflows/pr-build.yml |  2 +-
 .github/workflows/pr-test.yml  | 24 ++++++++++++++++++++++--
 .github/workflows/publish.yml  |  4 ++--
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
index c4b4de3e..f603d31f 100644
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/pr-build.yml
@@ -1,4 +1,4 @@
-name: build
+name: build and validate
 on:
   push:
     branches:
diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml
index 50fff33d..142a8834 100644
--- a/.github/workflows/pr-test.yml
+++ b/.github/workflows/pr-test.yml
@@ -30,7 +30,10 @@ jobs:
             gradle-packages-${{ runner.os }}
 
       - name: Unit test
-        run: ./gradlew jacocoTestReport
+        run: ./gradlew jacocoTestReport 
+        
+      - name: Copy unit test reports
+      - run: ./gradlew copyAllReports --output-dir=/tmp/unit-test-reports
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v1
@@ -39,9 +42,19 @@ jobs:
           fail_ci_if_error: true
           verbose: true
           flags: unit
+      
+      - name: Archive unit test report
+        uses: actions/upload-artifact@v1
+        with:
+          name: unit-test
+          path: ./tmp/unit-test-reports
+        if: ${{ always() }}
 
       - name: Integration test
-        run: ./gradlew jacocoIntegrationTestReport
+        run: ./gradlew jacocoIntegrationTestReport copyAllReports --output-dir=/tmp/integration-test-reports
+
+      - name: Copy integration test reports
+      - run: ./gradlew copyAllReports --output-dir=/tmp/integration-test-reports
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v1
@@ -50,3 +63,10 @@ jobs:
           fail_ci_if_error: true
           verbose: true
           flags: integration
+
+      - name: Archive integration test report
+        uses: actions/upload-artifact@v1
+        with:
+          name: integration-test
+          path: ./tmp/integration-test-reports
+        if: ${{ always() }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index dfa14b56..b518da91 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,4 +1,4 @@
-name: Publish Docker image
+name: Publish artifacts
 on:
 # Will only run when release is published. 
   release:
@@ -58,7 +58,7 @@ jobs:
           HELM_GCS_REPOSITORY: ${{ secrets.HELM_GCS_REPOSITORY }}
             # GITHUB_REF will be refs/tags/docker-MAJOR.MINOR.PATCH
         run: |
-            CHART_VERSION=$(echo ${GITHUB_REF} | cut -d/ -f 3)
+            CHART_VERSION=$(git describe --abbrev=0)
             CHART_NAME=$(awk '/^name:/ {print $2}' ./helm/Chart.yaml)
             export GOOGLE_APPLICATION_CREDENTIALS=${HOME}/helm-gcs-key.json
             echo $HELM_GCS_CREDENTIALS > ${GOOGLE_APPLICATION_CREDENTIALS}

From d765e95ebccdf15ff70d541232230071be8510c5 Mon Sep 17 00:00:00 2001
From: Jayesh Bapu Ahire <jayeshbahire@programmer.net>
Date: Mon, 21 Dec 2020 22:03:52 +0530
Subject: [PATCH 07/10] cleanup

---
 .github/workflows/pr-test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml
index 142a8834..45bcfbf7 100644
--- a/.github/workflows/pr-test.yml
+++ b/.github/workflows/pr-test.yml
@@ -33,7 +33,7 @@ jobs:
         run: ./gradlew jacocoTestReport 
         
       - name: Copy unit test reports
-      - run: ./gradlew copyAllReports --output-dir=/tmp/unit-test-reports
+        run: ./gradlew copyAllReports --output-dir=/tmp/unit-test-reports
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v1
@@ -54,7 +54,7 @@ jobs:
         run: ./gradlew jacocoIntegrationTestReport copyAllReports --output-dir=/tmp/integration-test-reports
 
       - name: Copy integration test reports
-      - run: ./gradlew copyAllReports --output-dir=/tmp/integration-test-reports
+        run: ./gradlew copyAllReports --output-dir=/tmp/integration-test-reports
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v1

From 84bca36d289dc6f701f72fe25a27a1843cc53a70 Mon Sep 17 00:00:00 2001
From: Jayesh Bapu Ahire <jayeshbahire@programmer.net>
Date: Mon, 21 Dec 2020 22:06:09 +0530
Subject: [PATCH 08/10] path error for reports

---
 .github/workflows/pr-test.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml
index 45bcfbf7..6804796b 100644
--- a/.github/workflows/pr-test.yml
+++ b/.github/workflows/pr-test.yml
@@ -33,7 +33,7 @@ jobs:
         run: ./gradlew jacocoTestReport 
         
       - name: Copy unit test reports
-        run: ./gradlew copyAllReports --output-dir=/tmp/unit-test-reports
+        run: ./gradlew copyAllReports --output-dir=/unit-test-reports
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v1
@@ -47,11 +47,11 @@ jobs:
         uses: actions/upload-artifact@v1
         with:
           name: unit-test
-          path: ./tmp/unit-test-reports
+          path: /unit-test-reports
         if: ${{ always() }}
 
       - name: Integration test
-        run: ./gradlew jacocoIntegrationTestReport copyAllReports --output-dir=/tmp/integration-test-reports
+        run: ./gradlew jacocoIntegrationTestReport copyAllReports --output-dir=/integration-test-reports
 
       - name: Copy integration test reports
         run: ./gradlew copyAllReports --output-dir=/tmp/integration-test-reports
@@ -68,5 +68,5 @@ jobs:
         uses: actions/upload-artifact@v1
         with:
           name: integration-test
-          path: ./tmp/integration-test-reports
+          path: /integration-test-reports
         if: ${{ always() }}

From 3f4919c7bad0ab15f11e77981f626a2515e3ae1f Mon Sep 17 00:00:00 2001
From: Jayesh Bapu Ahire <jayeshbahire@programmer.net>
Date: Mon, 21 Dec 2020 22:10:26 +0530
Subject: [PATCH 09/10] path error for reports

---
 .github/workflows/pr-test.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml
index 6804796b..f88b2d1c 100644
--- a/.github/workflows/pr-test.yml
+++ b/.github/workflows/pr-test.yml
@@ -33,7 +33,7 @@ jobs:
         run: ./gradlew jacocoTestReport 
         
       - name: Copy unit test reports
-        run: ./gradlew copyAllReports --output-dir=/unit-test-reports
+        run: ./gradlew copyAllReports --output-dir=/tmp/unit-test-reports
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v1
@@ -47,11 +47,11 @@ jobs:
         uses: actions/upload-artifact@v1
         with:
           name: unit-test
-          path: /unit-test-reports
+          path: /tmp/unit-test-reports
         if: ${{ always() }}
 
       - name: Integration test
-        run: ./gradlew jacocoIntegrationTestReport copyAllReports --output-dir=/integration-test-reports
+        run: ./gradlew jacocoIntegrationTestReport 
 
       - name: Copy integration test reports
         run: ./gradlew copyAllReports --output-dir=/tmp/integration-test-reports
@@ -68,5 +68,5 @@ jobs:
         uses: actions/upload-artifact@v1
         with:
           name: integration-test
-          path: /integration-test-reports
+          path: /tmp/integration-test-reports
         if: ${{ always() }}

From 603275c31691c7dbdd6605ca0147d927d3c95026 Mon Sep 17 00:00:00 2001
From: Jayesh Bapu Ahire <jayeshbahire@programmer.net>
Date: Mon, 21 Dec 2020 22:15:37 +0530
Subject: [PATCH 10/10] updates gradle plugin

---
 attribute-service/build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/attribute-service/build.gradle.kts b/attribute-service/build.gradle.kts
index cc4b6997..98c847fb 100644
--- a/attribute-service/build.gradle.kts
+++ b/attribute-service/build.gradle.kts
@@ -9,8 +9,8 @@ plugins {
   java
   application
   jacoco
-  id("org.hypertrace.docker-java-application-plugin") version "0.8.0"
-  id("org.hypertrace.docker-publish-plugin") version "0.8.0"
+  id("org.hypertrace.docker-java-application-plugin") version "0.8.1"
+  id("org.hypertrace.docker-publish-plugin") version "0.8.1"
   id("org.hypertrace.integration-test-plugin")
   id("org.hypertrace.jacoco-report-plugin")
 }