Skip to content
New issue

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

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

Already on GitHub? # to your account

fix vendor script #20

Merged
merged 1 commit into from
Sep 27, 2023
Merged

fix vendor script #20

merged 1 commit into from
Sep 27, 2023

Conversation

Tmonster
Copy link
Contributor

@Tmonster Tmonster commented Sep 27, 2023

seems like the last update vendor script changed last time the vendor script ran 16d50d4#diff-5207f4376418838c90f2fbb73b803096a1b41cae984e1c78af0726977a9331c6. Probably because everything gets added and committed, so the change is silently commited.

Now you can pass the surname of the duckdb repo, but the default is duckdb.
Also, if someone does change the vendor script, the changes are erased when the script is executed to avoid this happening again.

This will fix the broke R scripts on duckdb-main

https://github.com/duckdb/duckdb/actions/runs/6323197765/job/17170295075

@codecov-commenter
Copy link

Codecov Report

Merging #20 (023456c) into main (aa1643b) will increase coverage by 0.00%.
The diff coverage is n/a.

❗ Current head 023456c differs from pull request most recent head 8579444. Consider uploading reports for the commit 8579444 to get more accurate results

@@           Coverage Diff           @@
##             main      #20   +/-   ##
=======================================
  Coverage   85.63%   85.63%           
=======================================
  Files         106      106           
  Lines        3598     3599    +1     
=======================================
+ Hits         3081     3082    +1     
  Misses        517      517           

see 1 file with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@Tmonster Tmonster requested review from krlmlr and hannes September 27, 2023 10:32
@hannes hannes merged commit 754428e into duckdb:main Sep 27, 2023
@@ -23,5 +27,6 @@ echo "Importing commit $commit"
echo "R: configure"
python3 rconfigure.py

git checkout vendor.sh
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why do we need this?

Copy link
Collaborator

Choose a reason for hiding this comment

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

I see now. We could also check if the Git status is clean here.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Or selectively commit src/vendor only.

if [ -z "$1" ]; then
duckdir=../duckdb
else
duckdir=../$1
Copy link
Collaborator

Choose a reason for hiding this comment

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

I'd expect the user to give a directory path relative to the cwd, do we need to move this before the cd and use realpath?

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 27, 2024
# for free to subscribe to this conversation on GitHub. Already have an account? #.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants