Skip to content

Commit

Permalink
revert: undo "feat: add package related arguments to typstExtraArgs (#…
Browse files Browse the repository at this point in the history
…832 and #833)"  (#891)

* Revert "fix: cross build with `vendor-openssl` feature and bump version to 0.12.4-rc2 (#884)"

This reverts commit 254c4ce.

* Revert "feat: add package related arguments to `typstExtraArgs` (#833)"

This reverts commit 8e36f25.

* Revert "feat: use typst-kit's package functions (#832)"

This reverts commit d2afe78.

* build: bump version to 0.12.4-rc3

* docs: update changelog
  • Loading branch information
Myriad-Dreamin authored Nov 23, 2024
1 parent 254c4ce commit e184848
Show file tree
Hide file tree
Showing 20 changed files with 672 additions and 386 deletions.
26 changes: 16 additions & 10 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,14 @@ jobs:
platform: linux
arch: x64
regular_build: 'true'
cross: true
- os: ubuntu-20.04
rust-target: aarch64-unknown-linux-gnu
platform: linux
arch: arm64
cross: true
- os: ubuntu-20.04
rust-target: arm-unknown-linux-gnueabihf
platform: linux
arch: armhf
cross: true
- os: macos-13
rust-target: x86_64-apple-darwin
platform: darwin
Expand Down Expand Up @@ -112,20 +109,29 @@ jobs:
with:
targets: ${{ matrix.rust-target }}
if: (fromJson(env.isRelease) || fromJson(env.isNightly))
- name: Install llvm
if: matrix.platform == 'linux' && (fromJson(env.isRelease) || fromJson(env.isNightly))
run: |
sudo apt-get update
sudo apt-get install llvm
- name: Install AArch64 target toolchain
if: matrix.rust-target == 'aarch64-unknown-linux-gnu' && (fromJson(env.isRelease) || fromJson(env.isNightly))
run: |
sudo apt-get update
sudo apt-get install gcc-aarch64-linux-gnu
- name: Install ARM target toolchain
if: matrix.rust-target == 'arm-unknown-linux-gnueabihf' && (fromJson(env.isRelease) || fromJson(env.isNightly))
run: |
sudo apt-get update
sudo apt-get install gcc-arm-linux-gnueabihf
- name: Run rust-cache
uses: Swatinem/rust-cache@v2
if: (fromJson(env.isRelease) || fromJson(env.isNightly))
- name: Build tinymist binary (cross)
shell: pwsh
run: |
cargo install cross --git https://github.com/cross-rs/cross.git --locked --rev 085092ca
cross build --profile=gh-release -p tinymist --target ${{ matrix.rust-target }} --features vendor-openssl
if: matrix.cross && (startsWith(github.ref, 'refs/tags/') || matrix.regular_build == 'true')
- name: Build tinymist binary
shell: pwsh
run: |
cargo build --profile=gh-release -p tinymist --target ${{ matrix.rust-target }}
if: "!matrix.cross && (startsWith(github.ref, 'refs/tags/') || matrix.regular_build == 'true')"
if: startsWith(github.ref, 'refs/tags/') || matrix.regular_build == 'true'
- name: Rename debug symbols for windows
if: matrix.platform == 'win32' && (fromJson(env.isRelease) || fromJson(env.isNightly))
run: |
Expand Down
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,7 @@
"tinymist.fontPaths": [
"assets/fonts"
],
"files.watcherExclude": {
"**/target": true
},
}
Loading

0 comments on commit e184848

Please sign in to comment.