Skip to content

Upgrade to https: serving for JSON, links in docs #5992

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

Merged
merged 11 commits into from
May 1, 2019

Conversation

earlephilhower
Copy link
Collaborator

Fixes #5480

@earlephilhower earlephilhower added this to the 2.5.1 milestone Apr 16, 2019
Copy link
Collaborator

@devyte devyte left a comment

Choose a reason for hiding this comment

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

Some urls in the json don't seem to be working now, although I don't know if they ever did.
Example:
http://arduino.esp8266.com/versions/1.6.5-947-g39819f0/doc/reference.html
http://arduino.esp8266.com/versions/1.6.5-947-g39819f0/esp8266-1.6.5-947-g39819f0.zip

@igrr ? Maybe we should drop those ancient entries. Or some things still need to be migrated from the old server?

@earlephilhower
Copy link
Collaborator Author

@devyte, that's orthogonal to the PR. The code in the repo doesn't reference those older revs. The concatenated JSON file kept on the fileserver is the only spot those refs exists. Dropping bits from it is a separate (manual?) process.

@devyte
Copy link
Collaborator

devyte commented Apr 18, 2019

I was looking at this PR as the final step in the migration process, i. e. Merge this and the issue auto closes.
If you view it as orthogonal that's fine, but in that case a new issue is needed to track either reducing the json manually or migrating the old stuff to the new server.

@earlephilhower
Copy link
Collaborator Author

I'm fine doing that, but I think the SSH keys are hidden in the CI config, so it's not a simple matter of downloading, removing pre 2.3.x, and re-uploading. It all needs to be scripted as a release or something to make it happen. Seems like a PITA...am I missing something to make it more straightforward?

Maybe it's a matter of editing the merge release script to make it delete pre XXX versions. I suppose that's possible, if a little ugly...

@d-a-v
Copy link
Collaborator

d-a-v commented Apr 26, 2019

Maybe it's a matter of editing the merge release script to make it delete pre XXX versions. I suppose that's possible, if a little ugly...

Maybe in a future PR to keep this less ugly we can add a variable containing all releases that are meant to be kept, and a script-function that would filter out all other releases.

@d-a-v d-a-v requested a review from devyte April 27, 2019 17:18
@earlephilhower
Copy link
Collaborator Author

@devyte, for sanity's sake I've added a drop-versions script and set it to drop the obsolete and unavailable 1.6.5 versions as well as our -betas which have no reason to exist anymore.

After the final merge is done on the JSON, strip out any named versions
from the final product.

Removing 1.6.5-* and 2.5.0-beta(1,2,3) for now.
@earlephilhower earlephilhower merged commit 93ef9e7 into esp8266:master May 1, 2019
@earlephilhower earlephilhower deleted the https-serve branch May 1, 2019 06:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Serve package index over HTTPS
4 participants