Skip to content

Commit

Permalink
Merge branch 'main' into no-iron
Browse files Browse the repository at this point in the history
  • Loading branch information
lambda-fairy authored Oct 17, 2021
2 parents 6bb8d02 + 057a231 commit 463ed76
Show file tree
Hide file tree
Showing 17 changed files with 112 additions and 123 deletions.
10 changes: 2 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,7 @@ jobs:
override: true

- name: Build documentation
run: |
# https://github.com/rust-lang/cargo/issues/9919
export CARGO_HTTP_MULTIPLEXING=false
cd docs && make -j$(nproc)
run: cd docs && make -j$(nproc)

examples:
name: Examples
Expand All @@ -77,10 +74,7 @@ jobs:
override: true

- name: Doctest
run: |
# https://github.com/rust-lang/cargo/issues/9919
export CARGO_HTTP_MULTIPLEXING=false
cd doctest && cargo check
run: cd doctest && cargo check

rustfmt:
name: Rustfmt
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/publish-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,7 @@ jobs:
override: true

- name: Build documentation
run: |
# https://github.com/rust-lang/cargo/issues/9919
export CARGO_HTTP_MULTIPLEXING=false
cd docs && make -j$(nproc)
run: cd docs && make -j$(nproc)

- name: Deploy
uses: peaceiris/actions-gh-pages@v3
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

## [Unreleased]

- Update to support axum 0.2
[#303](https://github.com/lambda-fairy/maud/pull/303)

## [0.22.3] - 2021-09-27

- Support `no_std` + `alloc`.
[#278](https://github.com/lambda-fairy/maud/issues/278)
- Provide Tide support.
Expand Down Expand Up @@ -253,7 +258,8 @@
- Update to latest syntax extension API


[Unreleased]: https://github.com/lambda-fairy/maud/compare/v0.22.2...HEAD
[Unreleased]: https://github.com/lambda-fairy/maud/compare/v0.22.3...HEAD
[0.22.3]: https://github.com/lambda-fairy/maud/compare/v0.22.2...v0.22.3
[0.22.2]: https://github.com/lambda-fairy/maud/compare/v0.22.1...v0.22.2
[0.22.1]: https://github.com/lambda-fairy/maud/compare/v0.22.0...v0.22.1
[0.22.0]: https://github.com/lambda-fairy/maud/compare/v0.21.0...v0.22.0
Expand Down
Loading

0 comments on commit 463ed76

Please sign in to comment.