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

rebase on latest mdbook from https://github.com/rust-lang/mdBook #12

Closed
wants to merge 149 commits into from
Closed

rebase on latest mdbook from https://github.com/rust-lang/mdBook #12

wants to merge 149 commits into from

Conversation

lovettchris
Copy link

@lovettchris lovettchris commented Sep 2, 2022

I'm not sure why it's saying it can't merge, I did the rebase and tons of manual tedious conflict resolving, so I was hoping this would "just work". It all builds and runs fine on my machine... note this brings the new official version of --chapter from rust-lang#1741.

My branch says: "This branch is 148 commits ahead, 25 commits behind leanprover:master." and when I try and merge these 25 commits I get the conflicts all over again. So I think this means we will have to do a "git push -f " to push this rebased version and override what is in master, so that from then on rebasing from rust-lang will be easier.

joshrotenberg and others added 30 commits December 28, 2021 21:00
Config to toggle the run button on codeblocks
…-events

Fix `SummaryParser::parse_title()` consuming events (rust-lang#1743)
livereload uses host, port and HTTP(S) protocol of current page
mgeisler and others added 27 commits August 10, 2022 03:11
Before, a code block would always end with a final newline. The
newline was added unconditionally by `hide_lines`.

When the code block is syntax highlighted by highlight.js, this is not
a problem, no empty line is added for a final trailing `\n` character.
However, when the code block is editable and thus handled by the ACE
editor, a trailing newline _is_ significant. I believe this issue is
most closely described by ajaxorg/ace#2083
in the upstream repository.

The effect of the way ACE handles newlines is that a code block like

    <pre>
      Some code
    </pre>

will create an editor with _two_ lines, not just one.

By trimming trailing whitespace, we ensure that we don’t accidentally
create more lines in the ACE editor than necessary.
Avoid empty last line in editable code blocks
Make sure people use the right kind of asset-urls. This issue only shows up when deploying, not using `mdbook serve`.
Explain how to use `site-url` with asset URLs
Sometimes when working on large books it is handy to be able to run mdbook on a single chapter of a book.
Remove unneeded `type` attribute for `<script>`
* remove old mdbook ci scripts.

* Create build.yml

* fix tests

* fix build.yml syntax

* fix indentation

* rename workflow

* rename build

* upload build artifact on successful build.

* trigger new release if atag named "releases/v*" is created.

* echo github.ref

* make release tag name consistent

* don't need to upload artifacts

* add trigger on tag create

* fix binary drop names

* compress the target folders.

* fix zip names

* fix macos zip file name
@lovettchris lovettchris changed the title rebase on latest mdbook from git@github.com:rust-lang/mdBook.git rebase on latest mdbook from https://github.com/rust-lang/mdBook Sep 2, 2022
@lovettchris lovettchris closed this by deleting the head repository Mar 31, 2023
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.