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

Add CNAME file for docs.r-e.org #13

Merged
merged 1 commit into from
Nov 8, 2018
Merged

Add CNAME file for docs.r-e.org #13

merged 1 commit into from
Nov 8, 2018

Conversation

nastevens
Copy link
Member

See rust-embedded/wg#208 - Github keeps clearing the custom domain setting.

Signed-off-by: Nick Stevens <nick@bitcurry.com>
Copy link

@ryankurte ryankurte left a comment

Choose a reason for hiding this comment

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

lgtm, I wonder why gh keeps removing the setting / hope this works!

bors r+

@nastevens
Copy link
Member Author

No bors I guess? I'll just merge so we get this taken care of.

@nastevens nastevens merged commit 357a079 into rust-embedded:master Nov 8, 2018
@nastevens nastevens deleted the add-cname branch November 8, 2018 21:44
@adamgreen
Copy link
Contributor

I wonder if the CNAME file should be copied into the doc folder as part of the https://github.com/rust-embedded/docs/blob/master/ci/script.sh script since it looks like these CI scripts will do a forced git push and overwrite anything that has been previously merged into the gh-pages branch? Maybe the daily Travis CRON job is what causes the break?

@nastevens
Copy link
Member Author

For anyone coming back to this issue in the future - it was indeed the force push that seems to have been breaking things 🤞. Adding the --cname option to ghp-import seems to have fixed the issue, as this way the ghp-import tool creates the CNAME file for us before each force push. This was added in #14

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.

3 participants