Fixed merge-publish and disabled circleci publish workflow

[JBAhire]

Description

• Addresses Ronak's comments here: Transitions to GH action and resolves fork PR issue #43 (comment)
• Merges jobs into 2 workflow files.
• Disables CircleCI merge-publish and release-publish workflow.
• Merge-publish didn't run because workflow runs on push to main and not on PR closed so it doesn't have merge context. For merge condition to run the action should be closed and the merged key be true (as per: https://docs.github.com/en/free-pro-team@latest/developers/webhooks-and-events/webhook-events-and-payloads#pull_request). So, changed condition and also triggers for PR.

Testing

Please describe the tests that you ran to verify your changes. Please summarize what did you test and what needs to be tested e.g. deployed and tested helm chart locally.

Checklist:

• My changes generate no new warnings
• Any dependent changes have been merged and published in downstream modules

Documentation

• https://docs.github.com/en/free-pro-team@latest/developers/webhooks-and-events/webhook-events-and-payloads#pull_request).
• https://github.saobby.my.eu.orgmunity/t/trigger-workflow-only-on-pull-request-merge/17359/6
• https://docs.github.com/en/free-pro-team@latest/actions/reference/events-that-trigger-workflows#pull_request

[codecov]

Codecov Report

Merging #45 (603275c) into main (fc6f400) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##               main      #45   +/-   ##
=========================================
  Coverage     80.71%   80.71%           
- Complexity      222      245   +23     
=========================================
  Files            27       27           
  Lines           752      752           
  Branches         56       56           
=========================================
  Hits            607      607           
  Misses           98       98           
  Partials         47       47           

Flag	Coverage Δ	Complexity Δ
integration	69.51% <ø> (-11.21%)	0.00 <ø> (ø)
unit	67.77% <ø> (ø)	0.00 <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update fc6f400...603275c. Read the comment docs.

[kotharironak]

We will need the below condition to take changes from the forked pull request otherwise it will checkout only the main branch code

with:
        ref: ${{github.event.pull_request.head.ref}}
        repository: ${{github.event.pull_request.head.repo.full_name}}

[JBAhire]

yup. forgot about this earlier

[aaron-steinfeld]

Another issue I forgot til now - the tag generation for docker non-release images is based off the circle ci branch - we should update that:
Ref: https://github.com/hypertrace/hypertrace-gradle-docker-plugins/blob/c4cbaa615a03724c17c9eed0decf7311ac8128dc/hypertrace-gradle-docker-plugin/src/main/java/org/hypertrace/gradle/docker/DockerPlugin.java#L111-L119

[kotharironak]

https://github.com/hypertrace/hypertrace-gradle-docker-plugins/blob/c4cbaa615a03724c17c9eed0decf7311ac8128dc/hypertrace-gradle-docker-plugin/src/main/java/org/hypertrace/gradle/docker/DockerPlugin.java#L111-L119

As we will have to publish docker artifacts on main, we can do that for the on push event trigger of the main branch. Based on this doc -
https://docs.github.com/en/free-pro-team@latest/actions/reference/context-and-expression-syntax-for-github-actions#github-context, we can derive it from GITHUB_REF for the above on push event.

we will have to expose a branch GITHUB_BRANCH to the merge-publish step, so it can be read in the gradle plugin. And we can do this by adding one more step like below before merge-publish

if: github.event_name == 'push' 
	 run: | 
	 GHA_BRANCH="${GITHUB_REF#refs/heads/}"
	 echo "GHA_BRANCH=${BRANCH}" >> $GITHUB_ENV

[JBAhire]

https://github.com/hypertrace/hypertrace-gradle-docker-plugins/blob/c4cbaa615a03724c17c9eed0decf7311ac8128dc/hypertrace-gradle-docker-plugin/src/main/java/org/hypertrace/gradle/docker/DockerPlugin.java#L111-L119

As we will have to publish docker artifacts on main, we can do that for the on push event trigger of the main branch. Based on this doc -
https://docs.github.com/en/free-pro-team@latest/actions/reference/context-and-expression-syntax-for-github-actions#github-context, we can derive it from GITHUB_REF for the above on push event.

we will have to expose a branch GITHUB_BRANCH to the merge-publish step, so it can be read in the gradle plugin. And we can do this by adding one more step like below before merge-publish

if: github.event_name == 'push' 
	 run: | 
	 GHA_BRANCH="${GITHUB_REF#refs/heads/}"
	 echo "GHA_BRANCH=${BRANCH}" >> $GITHUB_ENV

addressed by hypertrace/hypertrace-gradle-docker-plugins#21

[aaron-steinfeld]

The artifacts produced by this are the same as the artifacts reported by the previous step I believe since we're not cleaning out. We can either clean between the two test phases, or a single upload for both runs is probably fine too.

As a next step (can be a separate PR) it would make things much nicer to extract the results so they're visible in the GH UI (looks like it doesn't let viewing the artifacts, only downloading them). Something like this action:
https://github.com/marketplace/actions/publish-unit-test-results

[JBAhire]

Noted. Makes sense to me.

[kotharironak]

Why do we have to archive?

[JBAhire]

#45 (comment)

[kotharironak]

We don't need this now as you moved the extraction of BRANCH_NAME in the Gradle plugin - https://github.com/hypertrace/hypertrace-gradle-docker-plugins/pull/21/files?

[kotharironak]

Let's use the same version v2.3.4 everywhere.

[kotharironak]

I have a few minor comments, can you take care of it in follow up PR if you think they are valid.
LGTM

[JBAhire]

@kotharironak , will do that.