improve dev UX by removing unnecessary toil #236
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Collaborator
sthaha
commented
Sep 15, 2023
•
sthaha
commented
- removes unnecessary rebases due to bundle generation
- Adds make target for installing oc
- Removes (ab)use of [[ $(command -v ...) ]] with command -v
sthaha
changed the title
Previously, `make bundle` will update the `createdAt` of the bundle CSV file even if there aren't any changes to the config. This requires PRs to be rebased to resolve the conflict in createdAt. This PR changes the bundle generation to revert the CSV file if the only change detected is for the `createdAt` timestamp, there by saving us from unnecessary rebases. Signed-off-by: Sunil Thaha <[email protected]>
vimalk78
reviewed
Sep 15, 2023
Makefile
Outdated
| @@ -265,6 +265,10 @@ operator-sdk: ## Download operator-sdk locally if necessary. | |||
| yq: ## Download yq locally if necessary | |||
| @./hack/tools.sh yq | |||
|
|
|||
| .PHONY: oc | |||
| oc: ## Download yq locally if necessary | |||
|
|
||
| if git diff --ignore-matching-lines='createdAt:' --exit-code "$csv_file" >/dev/null; then | ||
| info "no changes to $(basename $csv_file) detected; resetting it" | ||
| run git checkout -- "$csv_file" |
There was a problem hiding this comment.
is it safe to do git checkout from script
There was a problem hiding this comment.
yeah, the git diff explicitly checks if the only change is in createdAt ..
There was a problem hiding this comment.
* Adds make target for installing oc * Removes (ab)use of [[ $(command -v ...) ]] with command -v Signed-off-by: Sunil Thaha <[email protected]>
vimalk78
approved these changes
Sep 15, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.