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

[vcpkg] Add vcpkg_from_sourceforge (1/2) #11899

Merged
merged 36 commits into from
Jun 26, 2020

Conversation

JackBoosY
Copy link
Contributor

@JackBoosY JackBoosY commented Jun 12, 2020

There are 43 ports in vcpkg downloaded using sourceforge.
Adding a unified download method is convenient for modifying the download method of the sourceforge storage port in the future.

Related: #11502.

  • Add function vcpkg_from_sourceforge
  • Modify all ports involved in download
  • Add documentation

@JackBoosY JackBoosY added category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed info:internal This PR or Issue was filed by the vcpkg team. labels Jun 12, 2020
@JackBoosY JackBoosY marked this pull request as ready for review June 15, 2020 08:13
@JackBoosY
Copy link
Contributor Author

@Neumann-A @voskrese @cenit Could you please review this PR?

Thanks.

@cenit
Copy link
Contributor

cenit commented Jun 16, 2020

apart from one single note, it's a very nice addition IMHO.
Thanks @JackBoosY

@JackBoosY
Copy link
Contributor Author

In the next PR, I will add code to retry different mirrors in this function.

@JackBoosY JackBoosY changed the title [vcpkg] Add vcpkg_from_sourceforge [vcpkg] Add vcpkg_from_sourceforge (1/2) Jun 19, 2020
@JackBoosY JackBoosY requested a review from strega-nil June 19, 2020 06:42
Copy link
Contributor

@strega-nil strega-nil left a comment

Choose a reason for hiding this comment

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

That's the only things I see; I would still like to see moving from regex to substring, and printing an error if there's more than one /

@JackBoosY JackBoosY requested a review from strega-nil June 23, 2020 06:43
@BillyONeal BillyONeal requested a review from strega-nil June 24, 2020 03:39
Copy link
Contributor

@strega-nil strega-nil left a comment

Choose a reason for hiding this comment

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

Thanks JacK!

@strega-nil
Copy link
Contributor

What are the blockers to merging this? Just CI running?

@vicroms
Copy link
Member

vicroms commented Jun 26, 2020

Just CI

@BillyONeal
Copy link
Member

Yeah, for some reason the previous attempt broke inside Azure Pipelines (some of the machines dropped off the face of the earth)

@strega-nil
Copy link
Contributor

Cool :)

@BillyONeal BillyONeal merged commit a0e0c57 into microsoft:master Jun 26, 2020
@JackBoosY JackBoosY deleted the dev/jack/vcpkg_from_sourceforge branch June 28, 2020 02:31

vcpkg_download_distfile(ARCHIVE
URLS "https://ftp.pcre.org/pub/pcre/pcre2-${PCRE2_VERSION}.zip" "https://sourceforge.net/projects/pcre/files/pcre2/${PCRE2_VERSION}/pcre2-${PCRE2_VERSION}.zip/download"
Copy link
Contributor

Choose a reason for hiding this comment

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

In case of pcre2, the primary download server was:
https://ftp.pcre.org/pub/pcre/
This has been removed here by switching to vcpkg_from_sourceforge().
The following appears now in artifacts of failed CI-builds [1]:

-- Downloading https://downloads.sourceforge.net/project/pcre/pcre2/10.30/pcre2-10.30.zip... Failed. Status: 7;"Couldn't connect to server"

During the CI-build of commit a0bd59c it occurred two times (pcre2:x64-windows and pcre2:x64-uwp).
Is there a possibility to have a different download server like https://ftp.pcre.org/pub/pcre/ also when using vcpkg_from_sourceforge()? Otherwise the previous vcpkg_download_distfile() used for pcre2 would be more reliable.

[1] https://dev.azure.com/vcpkg/public/_build/results?buildId=39415&view=results

Copy link
Contributor Author

@JackBoosY JackBoosY Jun 28, 2020

Choose a reason for hiding this comment

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

I will take a look later. Thank's for notice that.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@c72578 Try to downloads source with all mirrors has been added in my other PR #12018. You can try that.

Copy link
Contributor

@c72578 c72578 Jun 28, 2020

Choose a reason for hiding this comment

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

@JackBoosY Thanks. The PR #12018 can improve the situation concerning downloads from sourceforge and sourceforge mirrors. However, it does not compensate the removal of different, independent download sources like https://ftp.pcre.org/pub/pcre/ etc.

Copy link
Member

Choose a reason for hiding this comment

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

@c72578 Does #12233 do what you want?

Copy link
Contributor

Choose a reason for hiding this comment

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

@BillyONeal, yes #12233 LGTM. It primarily uses the original download server and as an alternative possibility the improved download from sourceforge.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed info:internal This PR or Issue was filed by the vcpkg team.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants