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

docs: add disallow-username-in-url.d and haproxy-protocol.d on the list #2856

Merged
merged 2 commits into from Aug 13, 2018

Conversation

@kdudka
Copy link
Collaborator

@kdudka kdudka commented Aug 9, 2018

... to make make the files appear in distribution tarballs

bagder
bagder approved these changes Aug 9, 2018
Copy link
Member

@bagder bagder left a comment

Excellent! We should come up with some way to detect this already in travis... Any idea?

Loading

kdudka added a commit to kdudka/curl that referenced this issue Aug 9, 2018
... to make make the files appear in distribution tarballs

Closes curl#2856
kdudka added a commit to kdudka/curl that referenced this issue Aug 9, 2018
... when curl is built from distribution tarball

Closes curl#2856
@kdudka
Copy link
Collaborator Author

@kdudka kdudka commented Aug 9, 2018

I believe that 26a8eea would do the job for us but I am not able to verify it right now because Travis CI for some reason does not see newly created branches on my fork of curl.

Loading

.travis.yml Outdated
@@ -308,6 +308,7 @@ script:
rm -rf curl-99.98.97
# verify out-of-tree build
(tar xf curl-99.98.97.tar.gz && \
touch docs/{cmdline-opts,libcurl}/Makefile.inc && \
Copy link
Member

@bagder bagder Aug 10, 2018

Choose a reason for hiding this comment

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

this touches in the wrong dir, it needs to be prefixed with curl-99.98.97. But I don't think this triggers an error if there's one or two .d files missing in the cmdline-opts directory, does it?

Loading

@kdudka
Copy link
Collaborator Author

@kdudka kdudka commented Aug 10, 2018

Loading

@bagder
Copy link
Member

@bagder bagder commented Aug 10, 2018

Ah yes, you're right!

Loading

kdudka added a commit to kdudka/curl that referenced this issue Aug 10, 2018
... when curl is built from distribution tarball

Closes curl#2856
@kdudka
Copy link
Collaborator Author

@kdudka kdudka commented Aug 10, 2018

I have figured out how to trigger Travis CI jobs when I need to (opening PR against my own fork of curl did the trick). Unfortunately all my jobs, as well as regular upstream jobs, are now failing for unrelated reasons (some apt-get related failures). I will give it another try after the weekend...

Loading

@bagder
Copy link
Member

@bagder bagder commented Aug 10, 2018

We saw those apt failures in some other PRs too today. It looks like travis-side issues.

Loading

kdudka added a commit to kdudka/curl that referenced this issue Aug 13, 2018
... when curl is built from distribution tarball

Closes curl#2856
kdudka added a commit to kdudka/curl that referenced this issue Aug 13, 2018
... when curl is built from distribution tarball

Closes curl#2856
kdudka added 2 commits Aug 13, 2018
... when curl is built from distribution tarball

Closes curl#2856
... to make make the files appear in distribution tarballs

Closes curl#2856
@kdudka
Copy link
Collaborator Author

@kdudka kdudka commented Aug 13, 2018

I think I have updated .travis.yml correctly this time. See how the CI failure looks like:
https://travis-ci.org/kdudka/curl/jobs/415413873#L7400

Loading

@bagder
Copy link
Member

@bagder bagder commented Aug 13, 2018

That looks great!

Loading

@kdudka kdudka merged commit 233908a into curl:master Aug 13, 2018
3 of 5 checks passed
Loading
@kdudka kdudka deleted the docs branch Aug 13, 2018
xquery added a commit to xquery/curl that referenced this issue Sep 3, 2018
... when curl is built from distribution tarball

Closes curl#2856
xquery added a commit to xquery/curl that referenced this issue Sep 3, 2018
... to make make the files appear in distribution tarballs

Closes curl#2856
falconindy added a commit to falconindy/curl that referenced this issue Sep 10, 2018
... when curl is built from distribution tarball

Closes curl#2856
falconindy added a commit to falconindy/curl that referenced this issue Sep 10, 2018
... to make make the files appear in distribution tarballs

Closes curl#2856
@lock lock bot locked as resolved and limited conversation to collaborators Nov 11, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants