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

fix: target to use for cross build and bump version to 0.12.4-rc3 #885

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,35 +41,39 @@ jobs:
platform: win32
arch: x64
regular_build: 'true'
cross: false
- os: windows-latest
rust-target: aarch64-pc-windows-msvc
platform: win32
arch: arm64
cross: false
- os: ubuntu-20.04
rust-target: x86_64-unknown-linux-gnu
rust-target: x86_64-unknown-linux-musl
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this can help with rhel. but i heard that some libc function in musl is inefficient. we can observe if there is any slow down after changing this.

platform: linux
arch: x64
regular_build: 'true'
cross: true
- os: ubuntu-20.04
rust-target: aarch64-unknown-linux-gnu
rust-target: aarch64-unknown-linux-musl
platform: linux
arch: arm64
cross: true
- os: ubuntu-20.04
rust-target: arm-unknown-linux-gnueabihf
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure about this. i dont know the difference between arm targets

Copy link
Owner Author

@Myriad-Dreamin Myriad-Dreamin Nov 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We ran into some errors in #884. After diff typst CI scripting with ours, I guessed we should change targets supported by cross.

rust-target: armv7-unknown-linux-musleabi
platform: linux
arch: armhf
arch: armv7
cross: true
- os: macos-13
rust-target: x86_64-apple-darwin
platform: darwin
arch: x64
cross: false
- os: macos-13
rust-target: aarch64-apple-darwin
platform: darwin
arch: arm64
regular_build: 'true'
cross: false
name: build (${{ matrix.platform }}-${{ matrix.arch }})
runs-on: ${{ matrix.os }}
env:
Expand Down Expand Up @@ -112,6 +116,11 @@ jobs:
with:
targets: ${{ matrix.rust-target }}
if: (fromJson(env.isRelease) || fromJson(env.isNightly))
- name: Install llvm and musl
if: matrix.platform == 'linux' && (fromJson(env.isRelease) || fromJson(env.isNightly))
run: |
sudo apt-get update
sudo apt-get install llvm musl-dev
- name: Run rust-cache
uses: Swatinem/rust-cache@v2
if: (fromJson(env.isRelease) || fromJson(env.isNightly))
Expand Down Expand Up @@ -149,10 +158,14 @@ jobs:
cp "target/${{ matrix.rust-target }}/gh-release/tinymist$(If ('${{ matrix.platform }}' -eq 'win32') { '.exe' } else { '' } )" "editors/vscode/out/"
cp "target/${{ matrix.rust-target }}/gh-release/tinymist$(If ('${{ matrix.platform }}' -eq 'win32') { '.exe' } else { '' } )" "contrib/typst-preview/editors/vscode/out/"
cp "target/${{ matrix.rust-target }}/gh-release/tinymist$(If ('${{ matrix.platform }}' -eq 'win32') { '.exe' } else { '' } )" "tinymist-${{ env.target }}$(If ('${{ matrix.platform }}' -eq 'win32') { '.exe' } else { '' } )"
- name: Test tinymist
run: |
cross test --profile=gh-release --workspace --target ${{ matrix.rust-target }} --features vendor-openssl
if: matrix.cross && (fromJson(env.isRelease) || fromJson(env.isNightly)) && (matrix.platform == 'linux') && (matrix.arch == 'x64')
- name: Test tinymist
run: |
cargo test --profile=gh-release --workspace --target ${{ matrix.rust-target }}
if: (fromJson(env.isRelease) || fromJson(env.isNightly)) && (matrix.platform == 'linux') && (matrix.arch == 'x64')
if: "!matrix.cross && (fromJson(env.isRelease) || fromJson(env.isNightly)) && (matrix.platform == 'linux') && (matrix.arch == 'x64')"
- name: Upload split debug symbols for windows
if: matrix.platform == 'win32' && (fromJson(env.isRelease) || fromJson(env.isNightly))
uses: actions/upload-artifact@v4
Expand Down
34 changes: 17 additions & 17 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[workspace.package]
description = "An integrated language service for Typst."
authors = ["Myriad-Dreamin <camiyoru@gmail.com>", "Nathan Varner"]
version = "0.12.4-rc2"
version = "0.12.4-rc3"
edition = "2021"
readme = "README.md"
license = "Apache-2.0"
Expand Down Expand Up @@ -145,7 +145,7 @@ insta = { version = "1.39", features = ["glob"] }

# Our Own Crates
typst-preview = { path = "./crates/typst-preview" }
tinymist-assets = { version = "0.12.4-rc2" }
tinymist-assets = { version = "0.12.4-rc3" }
tinymist = { path = "./crates/tinymist/" }
tinymist-derive = { path = "./crates/tinymist-derive/" }
tinymist-analysis = { path = "./crates/tinymist-analysis/" }
Expand Down
2 changes: 1 addition & 1 deletion editors/vscode/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tinymist",
"version": "0.12.4-rc2",
"version": "0.12.4-rc3",
"description": "An integrated language service for Typst",
"keywords": [
"typst",
Expand Down
2 changes: 1 addition & 1 deletion syntaxes/textmate/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "typst-textmate",
"version": "0.12.4-rc2",
"version": "0.12.4-rc3",
"private": true,
"scripts": {
"compile": "npx tsc && node ./dist/main.mjs",
Expand Down
Loading