Merge pull request #2389 from ehuss/bump-version

Update to 0.4.40
2025-12-28 15:01:45 -05:00 · 2024-05-17 01:35:51 +00:00 · 2024-05-16 18:29:30 -07:00 · 2024-05-17 01:19:17 +00:00 · 2024-05-16 18:10:56 -07:00 · 2024-05-16 18:08:09 -07:00
10 changed files with 78 additions and 39 deletions
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -12,16 +12,9 @@ permissions:

 jobs:
  release:
-    name: Deploy Release
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        target:
-          - aarch64-unknown-linux-musl
-          - x86_64-unknown-linux-gnu
-          - x86_64-unknown-linux-musl
-          - x86_64-apple-darwin
-          - x86_64-pc-windows-msvc
        include:
          - target: aarch64-unknown-linux-musl
            os: ubuntu-20.04
@@ -33,8 +26,9 @@ jobs:
            os: macos-latest
          - target: x86_64-pc-windows-msvc
            os: windows-latest
+    name: Deploy ${{ matrix.target }}
    steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v4
    - name: Install Rust
      run: ci/install-rust.sh stable ${{ matrix.target }}
    - name: Build asset
@@ -47,7 +41,7 @@ jobs:
    name: GitHub Pages
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v4
    - name: Install Rust (rustup)
      run: rustup update stable --no-self-update && rustup default stable
    - name: Build book
@@ -64,7 +58,7 @@ jobs:
    name: Publish to crates.io
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v4
      - name: Install Rust (rustup)
        run: rustup update stable --no-self-update && rustup default stable
      - name: Publish
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -5,45 +5,67 @@ on:

 jobs:
  test:
-    name: Test
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        build: [stable, beta, nightly, macos, windows, msrv]
        include:
-          - build: stable
+          - name: stable linux
            os: ubuntu-latest
            rust: stable
-          - build: beta
+            target: x86_64-unknown-linux-gnu
+          - name: beta linux
            os: ubuntu-latest
            rust: beta
-          - build: nightly
+            target: x86_64-unknown-linux-gnu
+          - name: nightly linux
            os: ubuntu-latest
            rust: nightly
-          - build: macos
+            target: x86_64-unknown-linux-gnu
+          - name: stable x86_64-unknown-linux-musl
+            os: ubuntu-20.04
+            rust: stable
+            target: x86_64-unknown-linux-musl
+          - name: stable x86_64 macos
            os: macos-latest
            rust: stable
-          - build: windows
+            target: x86_64-apple-darwin
+          - name: stable aarch64 macos
+            os: macos-latest
+            rust: stable
+            target: aarch64-apple-darwin
+          - name: stable windows-msvc
            os: windows-latest
            rust: stable
-          - build: msrv
+            target: x86_64-pc-windows-msvc
+          - name: msrv
            os: ubuntu-20.04
            # sync MSRV with docs: guide/src/guide/installation.md and Cargo.toml
            rust: 1.74.0
+            target: x86_64-unknown-linux-gnu
+    name: ${{ matrix.name }}
    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - name: Install Rust
-      run: bash ci/install-rust.sh ${{ matrix.rust }}
+      run: bash ci/install-rust.sh ${{ matrix.rust }} ${{ matrix.target }}
    - name: Build and run tests
-      run: cargo test --locked
+      run: cargo test --locked --target ${{ matrix.target }}
    - name: Test no default
-      run: cargo test --no-default-features
+      run: cargo test --no-default-features --target ${{ matrix.target }}
+
+  aarch64-cross-builds:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install Rust
+      run: bash ci/install-rust.sh stable aarch64-unknown-linux-musl
+    - name: Build
+      run: cargo build --locked --target aarch64-unknown-linux-musl

  rustfmt:
    name: Rustfmt
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - name: Install Rust
      run: rustup update stable && rustup default stable && rustup component add rustfmt
    - run: cargo fmt --check
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Changelog

+## mdBook 0.4.40
+[v0.4.39...v0.4.40](https://github.com/rust-lang/mdBook/compare/v0.4.39...v0.4.40)
+
+### Fixed
+
+- Reverted the update to pulldown-cmark which broke the semver API.
+  [#2388](https://github.com/rust-lang/mdBook/pull/2388)
+
+## mdBook 0.4.39
+[v0.4.38...v0.4.39](https://github.com/rust-lang/mdBook/compare/v0.4.38...v0.4.39)
+
+### Fixed
+
+- Fixed the automatic deploy broken in the previous release.
+  [#2383](https://github.com/rust-lang/mdBook/pull/2383)
+
 ## mdBook 0.4.38
 [v0.4.37...v0.4.38](https://github.com/rust-lang/mdBook/compare/v0.4.37...v0.4.38)

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -977,7 +977,7 @@ dependencies = [

 [[package]]
 name = "mdbook"
-version = "0.4.38"
+version = "0.4.40"
 dependencies = [
 "ammonia",
 "anyhow",
@@ -1411,9 +1411,9 @@ dependencies = [

 [[package]]
 name = "pulldown-cmark"
-version = "0.11.0"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8746739f11d39ce5ad5c2520a9b75285310dbfe78c541ccf832d38615765aec0"
+checksum = "76979bea66e7875e7509c4ec5300112b316af87fa7a252ca91c448b32dfe3993"
 dependencies = [
 "bitflags 2.5.0",
 "memchr",
@@ -1423,9 +1423,9 @@ dependencies = [

 [[package]]
 name = "pulldown-cmark-escape"
-version = "0.11.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae"
+checksum = "bd348ff538bc9caeda7ee8cad2d1d48236a1f443c1fa3913c6a02fe0043b1dd3"

 [[package]]
 name = "quote"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mdbook"
-version = "0.4.38"
+version = "0.4.40"
 authors = [
    "Mathieu David <mathieudavid@mathieudavid.org>",
    "Michael-F-Bryan <michaelfbryan@gmail.com>",
@@ -27,7 +27,7 @@ handlebars = "5.0"
 log = "0.4.17"
 memchr = "2.5.0"
 opener = "0.7.0"
-pulldown-cmark = { version = "0.11.0", default-features = false, features = ["html"] }
+pulldown-cmark = { version = "0.10.0", default-features = false, features = ["html"] } # Do not update, part of the public api.
 regex = "1.8.1"
 serde = { version = "1.0.163", features = ["derive"] }
 serde_json = "1.0.96"
--- a/ci/install-rust.sh
+++ b/ci/install-rust.sh
@@ -22,6 +22,19 @@ then
        rustup component add llvm-tools-preview --toolchain=$TOOLCHAIN
        rustup component add rust-std-$TARGET --toolchain=$TOOLCHAIN
    fi
+    if [[ $TARGET == *"musl" ]]
+    then
+        # This is needed by libdbus-sys.
+        sudo apt update -y && sudo apt install musl-dev musl-tools -y
+    fi
+    if [[ $TARGET == "aarch64-unknown-linux-musl" ]]
+    then
+        echo CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=rust-lld >> $GITHUB_ENV
+        # This `CC` is some nonsense needed for libdbus-sys (via opener).
+        # I don't know if this is really the right thing to do, but it seems to work.
+        sudo apt install gcc-aarch64-linux-gnu -y
+        echo CC=aarch64-linux-gnu-gcc >> $GITHUB_ENV
+    fi
 fi

 rustup default $TOOLCHAIN
--- a/ci/make-release-asset.sh
+++ b/ci/make-release-asset.sh
@@ -12,10 +12,6 @@ TAG=${GITHUB_REF#*/tags/}

 host=$(rustc -Vv | grep ^host: | sed -e "s/host: //g")
 target=$2
-if [ "$host" != "$target" ]
-then
-  export "CARGO_TARGET_$(echo $target | tr a-z- A-Z_)_LINKER"=rust-lld
-fi
 export CARGO_PROFILE_RELEASE_LTO=true
 cargo build --locked --bin mdbook --release --target $target
 cd target/$target/release
--- a/guide/src/continuous-integration.md
+++ b/guide/src/continuous-integration.md
@@ -21,7 +21,7 @@ A simple approach would be to use the popular `curl` CLI tool to download the ex

 ```sh
 mkdir bin
-curl -sSL https://github.com/rust-lang/mdBook/releases/download/v0.4.38/mdbook-v0.4.38-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=bin
+curl -sSL https://github.com/rust-lang/mdBook/releases/download/v0.4.40/mdbook-v0.4.40-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=bin
 bin/mdbook build
 ```

--- a/src/cmd/command_prelude.rs
+++ b/src/cmd/command_prelude.rs
@@ -37,6 +37,7 @@ pub trait CommandExt: Sized {
        self._arg(arg!(-o --open "Opens the compiled book in a web browser"))
    }

+    #[cfg(any(feature = "watch", feature = "serve"))]
    fn arg_watcher(self) -> Self {
        #[cfg(feature = "watch")]
        return self._arg(
--- a/src/renderer/html_handlebars/search.rs
+++ b/src/renderer/html_handlebars/search.rs
@@ -193,10 +193,7 @@ fn render_item(
                    body.push(' ');
                }
            }
-            Event::Text(text)
-            | Event::Code(text)
-            | Event::InlineMath(text)
-            | Event::DisplayMath(text) => {
+            Event::Text(text) | Event::Code(text) => {
                if in_heading {
                    heading.push_str(&text);
                } else {
Author	SHA1	Message	Date
Eric Huss	94b922d27a	Merge pull request #2389 from ehuss/bump-version Update to 0.4.40	2024-05-17 01:35:51 +00:00
Eric Huss	0a8f9a3f6b	Update to 0.4.40	2024-05-16 18:29:30 -07:00
Eric Huss	a5d4d1e0ad	Merge pull request #2386 from ehuss/revert-pulldown-cmark Revert update to pulldown-cmark 0.11	2024-05-17 01:19:17 +00:00
Eric Huss	2bdb5866a7	Add comment not to update pulldown-cmark.	2024-05-16 18:10:56 -07:00
Eric Huss	65932289f7	Revert "Merge pull request #2381 from ehuss/update-pulldown-cmark" This reverts commit `8884008b4d`, (https://github.com/rust-lang/mdBook/pull/2381) reversing changes made to `3d6caa504f`. The `pulldown_cmark` types are a public API, which I did not realize.	2024-05-16 18:08:09 -07:00
Eric Huss	e34f9c6408	Merge pull request #2385 from ehuss/bump-version Update to 0.4.39	2024-05-17 00:50:51 +00:00
Eric Huss	e0e13e375e	Merge pull request #2384 from ehuss/arg_watcher-dead-code Fix dead_code warning for arg_watcher	2024-05-17 00:44:51 +00:00
Eric Huss	4c333bee95	Update to 0.4.39	2024-05-16 17:44:03 -07:00
Eric Huss	965f7bde0d	Fix dead_code warning for arg_watcher	2024-05-16 17:38:52 -07:00
Eric Huss	cfcba01d03	Merge pull request #2383 from ehuss/musl-fix CI: Test more targets.	2024-05-17 00:36:14 +00:00
Eric Huss	3dc40f1742	Update actions/checkout to v4	2024-05-16 17:29:23 -07:00
Eric Huss	5a366f5707	Test more targets.	2024-05-16 17:27:28 -07:00