update R CMD workflow to apply patches in .github/patches/duckdb-r #9412
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
carlopi
suggested changes
Oct 20, 2023
.github/workflows/R_CMD_CHECK.yml
Outdated
| - name: Apply duckdb-r patches | ||
| shell: bash | ||
| run: | | ||
| for filename in $GITHUB_WORKSPACE/$DUCKDB_SRC/.github/patches/duckdb-r/*.patch; do |
There was a problem hiding this comment.
Suggested change
| for filename in $GITHUB_WORKSPACE/$DUCKDB_SRC/.github/patches/duckdb-r/*.patch; do | |
| for filename in ${{ env.DUCKDB_SRC }}/.github/patches/duckdb-r/*.patch; do |
(not that I am completely sure, but this seems to make more sense)
There was a problem hiding this comment.
$GITHUB_WORKSPACE is just the absolute path. we also use $GITHUB_WORKSPACE/$DUCKDB_SRC/ here
There was a problem hiding this comment.
nvm, also realized that this was executing in the wrong directory
There was a problem hiding this comment.
I got a bit lost with the directories, unsure.
Actually one thing you need to add, to handle the case of no files being there, is:
shopt -s nullglob
See for example this part of the Nightly workflow: https://github.com/duckdb/duckdb/blob/main/.github/workflows/NightlyTests.yml#L630
carlopi
approved these changes
Oct 20, 2023
carlopi
approved these changes
Oct 20, 2023
|
Thanks! LGTM |
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.
If the duckdb repo ever creates breaking changes to the duckdb-r repo that need patches, we can prevent CI from yelling at us if we include the patches. These patches then need to be applied to duckdb-r at some later date.
Most likely the duckdb-r CI will yell when the sources are updated. One idea might be to apply the patches from within the vendor script.
Needed because #9406 will break the duckdb-r client