Skip to content

Commit

Permalink
Merge branch 'merge-8.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
OrangeX4 committed Sep 17, 2023
2 parents 87b49b7 + a068d7d commit 27b786d
Show file tree
Hide file tree
Showing 747 changed files with 130,066 additions and 23,171 deletions.
16 changes: 0 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
name: Continuous integration
on: [push, pull_request]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

env:
RUSTFLAGS: "-Dwarnings"
RUSTDOCFLAGS: "-Dwarnings"
Expand Down Expand Up @@ -39,15 +35,3 @@ jobs:
- uses: dtolnay/rust-toolchain@1.70.0
- uses: Swatinem/rust-cache@v2
- run: cargo check --workspace

nix-flake:
name: Test Nix Flake
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: DeterminateSystems/nix-installer-action@v4
- uses: DeterminateSystems/magic-nix-cache-action@v2
- run: nix flake check
- run: nix build
- run: nix shell -c typst --version
- run: nix run . -- --version
14 changes: 5 additions & 9 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ jobs:
- target: armv7-unknown-linux-musleabi
os: ubuntu-latest
cross: true
- target: riscv64gc-unknown-linux-gnu
os: ubuntu-latest
cross: true
- target: x86_64-apple-darwin
os: macos-latest
cross: false
Expand All @@ -37,9 +34,6 @@ jobs:
- target: x86_64-pc-windows-msvc
os: windows-latest
cross: false
- target: aarch64-pc-windows-msvc
os: windows-latest
cross: true

steps:
- uses: actions/checkout@v3
Expand All @@ -51,11 +45,11 @@ jobs:
if: ${{ matrix.cross}}
run: |
cargo install cross --git https://github.com/cross-rs/cross.git
cross build -p typst-cli --release --target ${{ matrix.target }}
cross build -p typst-cli --release --target ${{ matrix.target }} --features self-update
- name: Run Cargo
if: ${{ !matrix.cross }}
run: cargo build -p typst-cli --release --target ${{ matrix.target }}
run: cargo build -p typst-cli --release --target ${{ matrix.target }} --features self-update

- name: create artifact directory
shell: bash
Expand All @@ -71,7 +65,9 @@ jobs:
tar cJf $directory.tar.xz $directory
fi
- uses: ncipollo/release-action@v1
- uses: ncipollo/release-action@v1.12.0
with:
artifacts: "typst-${{ matrix.target }}.*"
allowUpdates: true
omitNameDuringUpdate: true
omitBodyDuringUpdate: true
6 changes: 2 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ desktop.ini
# Tests and benchmarks
tests/png
tests/pdf
tests/svg
tests/target
tarpaulin-report.html

# Rust
/target
bench/target
**/*.rs.bk

# Node
Expand All @@ -27,6 +27,4 @@ package-lock.json
# Documentation
/assets/docs
/assets/docs.json
/dist

*.ps1
/dist
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ land your contribution below.
2. Fork the Typst repository and start with your contribution. If you, at any
point in this process, are unsure about how to do something in the Typst
codebase, reach out to a maintainer or a more experienced contributor. Also
have a look at the [`ARCHITECTURE.md`][architecture] file. It explains how
have a look at the [`architecture.md`][architecture] file. It explains how
the compiler works.
3. Create a pull request (PR) in the Typst repository, outlining your
contribution, the technical rationale behind it, and, if it includes a new
Expand Down Expand Up @@ -69,5 +69,5 @@ Typst!
[issue]: https://github.com/typst/typst/issues
[testing]: https://github.com/typst/typst/blob/main/tests/README.md
[#contributors]: https://discord.com/channels/1054443721975922748/1088371867913572452
[architecture]: https://github.com/typst/typst/blob/main/ARCHITECTURE.md
[architecture]: https://github.com/typst/typst/blob/main/docs/dev/architecture.md
[changelog]: https://typst.app/docs/changelog/
Loading

0 comments on commit 27b786d

Please sign in to comment.