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

RHOAIENG-16403: chore(Makefile): remove the now-unnecessary trailing slash (\s*;?\s*\\$) #808

Merged
merged 2 commits into from
Dec 16, 2024

Conversation

jiridanek
Copy link
Member

@jiridanek jiridanek commented Dec 13, 2024

https://issues.redhat.com/browse/RHOAIENG-16403

Follow-up to

Description

We're able to remove the unnecessary continuation lines from the Makefile, now that the recipe body is running in a single shell.

How Has This Been Tested?

Merge criteria:

  • The commits are squashed in a cohesive manner and have meaningful messages.
  • Testing instructions have been added in the PR body (for PRs involving changes that are not immediately obvious).
  • The developer has manually tested the changes and verified that the changes work

I wanted to ignore this until we switch to `>`, but it actually started causing CI build failures right now,
 so it must be fixed after all.
@jiridanek jiridanek added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Dec 13, 2024
@@ -14,7 +14,7 @@ MAKEFLAGS += --no-builtin-rules

# todo: leave the default recipe prefix for now
ifeq ($(origin .RECIPEPREFIX), undefined)
$(error This Make does not support .RECIPEPREFIX. Please use GNU Make 4.0 or later)
$(error This Make does not support .RECIPEPREFIX. Please use GNU Make 4.0 or later)
Copy link
Member

Choose a reason for hiding this comment

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

intentional?

Copy link
Member Author

@jiridanek jiridanek Dec 13, 2024

Choose a reason for hiding this comment

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

Yes, completely deliberate.

This PR ended up with indenting everything with tabs (🎉), except for this single line (😢). This one can't be indented with tabs, because that would cause syntax error

Makefile:17: *** commands commence before first target.  Stop.

The only way to achieve consistent indentation in the whole file is to not indent line 17.

@atheo89
Copy link
Member

atheo89 commented Dec 16, 2024

/lgtm

@jstourac
Copy link
Member

/lgtm

/override ci/prow/images

Copy link
Contributor

openshift-ci bot commented Dec 16, 2024

@jstourac: Overrode contexts on behalf of jstourac: ci/prow/images

In response to this:

/lgtm

/override ci/prow/images

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@jiridanek
Copy link
Member Author

/approve

i went over the diff again, still looks good to me, giving it approve

Copy link
Contributor

openshift-ci bot commented Dec 16, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jiridanek

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot bot merged commit 093eb79 into opendatahub-io:main Dec 16, 2024
7 checks passed
@jiridanek jiridanek deleted the jd_makefile_safety branch December 16, 2024 15:54
jiridanek added a commit to jiridanek/notebooks that referenced this pull request Jan 8, 2025
…slash (`\s*;?\s*\\$`) (opendatahub-io#808)

* RHOAIENG-16403: chore(Makefile): remove the now-unnecessary trailing `\s*;?\s*\\$`

* fix some wrongly indented lines

I wanted to ignore this until we switch to `>`, but it actually started causing CI build failures right now,
 so it must be fixed after all.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants