Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Simplify Makefile Architecture #832

Merged
merged 34 commits into from
Mar 7, 2024

Conversation

TeodorSAP
Copy link
Member

Description

Changes proposed in this pull request (what was done and why):

  • Split general Makefile into sub-makefiles (provision.mk and dependencies.mk)
  • Implement .env file, that stores environment variables accessible from both makefiles and shell scripts
  • Remove unnecessary make targets (e.g. e2e, upgrade, integration running targets)
  • Adapt GitHub actions and scripts that were influenced by the Makefile changes
  • Update documentation with necessary ginkgo-cli commands
  • Create an ADR with the proposed decisions

Changes refer to particular issues, PRs or documents:

Traceability

  • The PR is linked to a GitHub issue.
  • New features have a milestone set.
  • New features have defined acceptance criteria in a corresponding GitHub Issue, and all criteria are satisfied with this PR.
  • The corresponding GitHub issue has a respective area and kind label.
  • The follow-up issues (if any) are linked in the Related Issues section.
  • Adjusted the documentation if the change is user-facing.
  • The feature is unit-tested
  • The feature is e2e-tested

@TeodorSAP TeodorSAP requested review from a team as code owners February 28, 2024 15:54
@kyma-bot kyma-bot added cla: yes Indicates the PR's author has signed the CLA. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Feb 28, 2024
Copy link
Contributor

@NHingerl NHingerl left a comment

Choose a reason for hiding this comment

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

Nice!

If this were user documentation, I'd ask you to adjust the diagrams to match our guidelines. However, I seem to be turning soft with age and I'll just ask you to familiarize yourself with the Kyma diagram guidelines for future diagram draftsmanship.

docs/contributor/arch/009-makefile-architecture.md Outdated Show resolved Hide resolved
docs/contributor/arch/009-makefile-architecture.md Outdated Show resolved Hide resolved
docs/contributor/arch/009-makefile-architecture.md Outdated Show resolved Hide resolved
docs/contributor/arch/009-makefile-architecture.md Outdated Show resolved Hide resolved
docs/contributor/arch/009-makefile-architecture.md Outdated Show resolved Hide resolved
docs/contributor/arch/009-makefile-architecture.md Outdated Show resolved Hide resolved
docs/contributor/development.md Outdated Show resolved Hide resolved
docs/contributor/development.md Outdated Show resolved Hide resolved
docs/contributor/development.md Show resolved Hide resolved
NHingerl
NHingerl previously approved these changes Feb 29, 2024
@kyma-bot kyma-bot added the lgtm Looks good to me! label Feb 29, 2024
.env Show resolved Hide resolved
.env Outdated Show resolved Hide resolved
Makefile Outdated Show resolved Hide resolved
hack/make/dependencies.mk Outdated Show resolved Hide resolved
hack/make/provision.mk Outdated Show resolved Hide resolved
@kyma-bot kyma-bot removed the lgtm Looks good to me! label Mar 6, 2024
@TeodorSAP TeodorSAP requested a review from shorim March 6, 2024 10:40
@kyma-bot kyma-bot added the lgtm Looks good to me! label Mar 6, 2024
@TeodorSAP TeodorSAP requested a review from NHingerl March 6, 2024 12:39
@kyma-bot kyma-bot merged commit 3402365 into kyma-project:main Mar 7, 2024
20 checks passed
@a-thaler a-thaler added this to the 1.11.0 milestone Mar 7, 2024
@a-thaler a-thaler added area/ci Changes to GithubActions kind/chore Categorizes issue or PR as related to a chore. labels Mar 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/ci Changes to GithubActions cla: yes Indicates the PR's author has signed the CLA. kind/chore Categorizes issue or PR as related to a chore. lgtm Looks good to me! size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Simplify Makefile
5 participants