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.

Sign up for GitHub

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

Jump to bottom

Also allow Travis to download private archives #3099

Merged
merged 2 commits into from
Dec 3, 2018
Merged

Also allow Travis to download private archives #3099

merged 2 commits into from
Dec 3, 2018

Conversation

ryandesign
Copy link
Contributor

Description

Also allow Travis to download private archives

See: https://trac.macports.org/ticket/54800

Type(s)
  • bugfix
  • enhancement
  • security fix

@ryandesign ryandesign requested a review from l2dy November 29, 2018 23:13
@macportsbot macportsbot added the by: member Created by a member with commit rights label Nov 29, 2018
@ryandesign
Copy link
Contributor Author

Don't merge this yet... let me check one thing...

@ryandesign
Also allow Travis to download private archives
8320efb 
See: https://trac.macports.org/ticket/54800
@ryandesign
Prefer public archives over private archives
e8ea4df 
Right now, while we're setting things up, the private server also has
the public archives, but we don't want to waste time adding those to
the CDN cache when they're already in the public server's CDN cache.

See: https://trac.macports.org/ticket/54800
@ryandesign
Copy link
Contributor Author

Ok, added preferred_hosts so that it shouldn't try to get public archives from the private server. This should be ready to merge, if @l2dy agrees.

@ryandesign
Copy link
Contributor Author

Wait, I need to sign all those private archives first.

l2dy
l2dy approved these changes Nov 30, 2018
View reviewed changes
Copy link
Member

@l2dy l2dy left a comment

Choose a reason for hiding this comment

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

archive_site_local is not documented in macports.conf.default or macports.conf(5). If it's just a backup archive_site, LGTM.

@ryandesign
Copy link
Contributor Author

Ok, the private archives are signed.

@pmetzger
Copy link
Member

Okay, so should this be merged now?

@ryandesign ryandesign merged commit 4dad85a into macports:master Dec 3, 2018
@ryandesign ryandesign deleted the travis-private-archives branch December 3, 2018 00:44
@ryandesign
Copy link
Contributor Author

I've merged this, then I submitted two new PRs, and I do not see these changes reflected in those builds. Does something else need to be done to get Travis to use these changes? Or does it just take some time for Travis to update to them?

@l2dy
Copy link
Member

l2dy commented Dec 3, 2018

I've merged this, then I submitted two new PRs, and I do not see these changes reflected in those builds. Does something else need to be done to get Travis to use these changes? Or does it just take some time for Travis to update to them?

The Travis configuration is read from your PR, so you need to rebase your changes onto the current master.

@ryandesign
Copy link
Contributor Author

Ok, I tried again with #3118 but the logs still show no evidence of attempts to download archives from the private server.

@ryandesign
Copy link
Contributor Author

It turns out archive_site_local is completely broken. I thought I had tested this on my system and it worked, however I forgot that I had also set up archive_sites.conf, and that's what was working.

Let me think about what I want to do. One options is to switch to using archive_sites.conf, which would work for Travis but would be confusing for our buildbot setup, and I'd like to keep them similar where possible.

Alternately, I could have Travis patch MacPorts to fix the bug. This is probably what I want to do since it's a three-character fix. There is still another bug in MacPorts' handling of archive_site_local but the bug will not affect Travis because it only happens when multiple URLs are specified.

ryandesign added a commit that referenced this pull request Dec 4, 2018
@ryandesign
Specify archive_site_local correctly, with :tbz2
e74b76f 
See: #3099
See: https://trac.macports.org/ticket/54800
ryandesign added a commit that referenced this pull request Dec 4, 2018
@ryandesign
Fix archive_site_local base bug for Travis
b00a348 
See: https://trac.macports.org/ticket/57717
See: https://trac.macports.org/ticket/54800
See: #3099
ryandesign added a commit that referenced this pull request Dec 4, 2018
@ryandesign
Travis: Prefer public archives over private ones
531720b 
I had tried to do this with preferred_hosts before, but it appears to
have no effect on archive_site_local.

See: https://trac.macports.org/ticket/57720

Instead list both the public and the private URLs in archive_site_local.
They appear to be tried in the order listed.

But then we need to fix the base bug with multiple URLs in
archive_site_local:

See: https://trac.macports.org/ticket/57718

See: https://trac.macports.org/ticket/54800
See: #3099
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@l2dy l2dy l2dy approved these changes

Assignees
No one assigned
Labels
by: member Created by a member with commit rights
Milestone
No milestone
4 participants
@ryandesign @pmetzger @l2dy @macportsbot