Skip to content

Streamline GHA workflows and Dockerfile; remove .ci directory#1172

Merged
shreyas-s-rao merged 4 commits intogardener:masterfrom
shreyas-s-rao:fix/gha/general
Oct 13, 2025
Merged

Streamline GHA workflows and Dockerfile; remove .ci directory#1172
shreyas-s-rao merged 4 commits intogardener:masterfrom
shreyas-s-rao:fix/gha/general

Conversation

@shreyas-s-rao
Copy link
Member

@shreyas-s-rao shreyas-s-rao commented Sep 19, 2025

How to categorize this PR?

/area dev-productivity
/kind enhancement

What this PR does / why we need it:
This PR introduces the following changes in the GHA workflow:

  • renamed build.yaml to base.yaml
  • renamed run-integration-tests to run-tests in base.yaml
  • split sast-lint job into check and sast-lint
  • oci-images job now depends on prepare, checks, tests, sast-lint jobs
  • Move binary build command from .ci/build to make target make build, which replaces make druid
  • Got rid of all .ci scripts, so GHA workflow jobs like checks, tests and sast-lint now directly call make targets; Dockerfile uses make build instead calling.ci/build script

Special notes for your reviewer:
/invite @unmarshall
Thanks for the suggestions.

Release note:

`.ci` scripts have been removed. As a consequence, GHA workflows and Dockerfile are now streamlined.

`make druid` has been replaced by `make build` with the correct ldflags and args.

@shreyas-s-rao shreyas-s-rao added this to the v0.33.0 milestone Sep 19, 2025
@shreyas-s-rao shreyas-s-rao requested a review from a team as a code owner September 19, 2025 14:47
@gardener-robot gardener-robot added the needs/review Needs review label Sep 19, 2025
@ghost ghost added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Sep 19, 2025
@gardener-robot gardener-robot added area/dev-productivity Developer productivity related (how to improve development) kind/enhancement Enhancement, improvement, extension labels Sep 19, 2025
@shreyas-s-rao
Copy link
Member Author

shreyas-s-rao commented Sep 19, 2025

/hold until #1170 is merged, to enable usage of make check-license-headers.

@gardener-robot gardener-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. needs/second-opinion Needs second review by someone else reviewed/do-not-merge Has no approval for merging as it may break things, be of poor quality or have (ext.) dependencies labels Sep 19, 2025
@shreyas-s-rao shreyas-s-rao force-pushed the fix/gha/general branch 3 times, most recently from cb22713 to b57d808 Compare September 19, 2025 15:19
unmarshall
unmarshall requested changes Sep 25, 2025
View reviewed changes
@gardener-robot gardener-robot added the needs/changes Needs (more) changes label Sep 25, 2025
@shreyas-s-rao shreyas-s-rao mentioned this pull request Sep 26, 2025
Merged
@shreyas-s-rao
Copy link
Member Author

shreyas-s-rao commented Oct 11, 2025

@unmarshall addressed your review comment, PTAL. Even though this PR changes the workflows, it seems the GHA workflow runner still pulls the workflow definition from master branch and tries to call .ci/check, which no longer exists in this PR. Hence the sast-lint/run-linter step fails (which no longer exists in my PR to begin with). Weird.

@gardener-robot gardener-robot added the needs/rebase Needs git rebase label Oct 13, 2025
@gardener-robot
Copy link

gardener-robot commented Oct 13, 2025

@shreyas-s-rao You need rebase this pull request with latest master branch. Please check.

renormalize
renormalize approved these changes Oct 13, 2025
View reviewed changes
Copy link
Member

@renormalize renormalize left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you so much for the cleanup @shreyas-s-rao!

@shreyas-s-rao
Copy link
Member Author

shreyas-s-rao commented Oct 13, 2025

@renormalize thanks for the quick review. I've addressed your comments. PTAL.

renormalize
renormalize approved these changes Oct 13, 2025
View reviewed changes
Copy link
Member

@renormalize renormalize left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@gardener-robot gardener-robot added the reviewed/lgtm Has approval for merging label Oct 13, 2025
@gardener-robot gardener-robot removed needs/changes Needs (more) changes needs/rebase Needs git rebase needs/review Needs review needs/second-opinion Needs second review by someone else labels Oct 13, 2025
@shreyas-s-rao
Copy link
Member Author

shreyas-s-rao commented Oct 13, 2025

Merging in spite of failing sast-lint job, since sast-lint job comes from master branch GHA definition, but the repo is checked out from the PR and the .ci scripts don't exist in the PR. Once the PR is merged, the workflow should pass again.

@shreyas-s-rao shreyas-s-rao merged commit 636b6cc into gardener:master Oct 13, 2025
15 of 16 checks passed
@gardener-robot gardener-robot added the status/closed Issue is closed (either delivered or triaged) label Oct 13, 2025
@shreyas-s-rao shreyas-s-rao deleted the fix/gha/general branch October 13, 2025 16:37
@shreyas-s-rao shreyas-s-rao mentioned this pull request Oct 14, 2025
Merged
heldkat pushed a commit to heldkat/etcd-druid that referenced this pull request Oct 15, 2025
@shreyas-s-rao @heldkat
Streamline GHA workflows and Dockerfile; remove .ci directory (gard…
b581e4e 
…ener#1172)

* Streamline GHA workflows, remove `.ci` directory

* Add `make check-license-headers` to GHA `checks` job

* Run tests in parallel using strategy.matrix
heldkat pushed a commit to heldkat/etcd-druid that referenced this pull request Oct 15, 2025
@shreyas-s-rao @heldkat
Streamline GHA workflows and Dockerfile; remove .ci directory (gard…
09d34f5 
…ener#1172)

* Streamline GHA workflows, remove `.ci` directory

* Add `make check-license-headers` to GHA `checks` job

* Run tests in parallel using strategy.matrix
Shreyas-s14 pushed a commit to seshachalam-yv/etcd-druid that referenced this pull request Oct 17, 2025
@shreyas-s-rao @Shreyas-s14
Streamline GHA workflows and Dockerfile; remove .ci directory (gard…
5073407 
…ener#1172)

* Streamline GHA workflows, remove `.ci` directory

* Add `make check-license-headers` to GHA `checks` job

* Run tests in parallel using strategy.matrix
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@renormalize renormalize renormalize approved these changes

@unmarshall unmarshall Awaiting requested review from unmarshall

Assignees

No one assigned

Labels

area/dev-productivity Developer productivity related (how to improve development) kind/enhancement Enhancement, improvement, extension reviewed/do-not-merge Has no approval for merging as it may break things, be of poor quality or have (ext.) dependencies reviewed/lgtm Has approval for merging reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) size/L Denotes a PR that changes 100-499 lines, ignoring generated files. status/closed Issue is closed (either delivered or triaged)

Projects

None yet

Milestone

v0.33.0

Development

Successfully merging this pull request may close these issues.

4 participants

@shreyas-s-rao @gardener-robot @unmarshall @renormalize