Revert "fix: cross build with vendor-openssl feature and bump versi…

…on to 0.12.4-rc2 (#884)"

This reverts commit 254c4ce.

.github/workflows/release.yml

@@ -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
@@ -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: |

Cargo.toml

@@ -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-rc1"
 edition = "2021"
 readme = "README.md"
 license = "Apache-2.0"
@@ -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-rc1" }
 tinymist = { path = "./crates/tinymist/" }
 tinymist-derive = { path = "./crates/tinymist-derive/" }
 tinymist-analysis = { path = "./crates/tinymist-analysis/" }

contrib/typlite/Cargo.toml

@@ -13,14 +13,8 @@ repository.workspace = true
 name = "typlite"
 path = "src/main.rs"
 
-[features]
-
-# Whether to vendor OpenSSL. Not applicable to Windows and macOS builds.
-vendor-openssl = ["typst-kit/vendor-openssl"]
-
 [dependencies]
 typlite.workspace = true
 clap.workspace = true
 tinymist-world.workspace = true
 ecow.workspace = true
-typst-kit.workspace = true

crates/tinymist/Cargo.toml

@@ -81,7 +81,6 @@ open = { workspace = true, optional = true }
 dirs.workspace = true
 base64.workspace = true
 rayon.workspace = true
-typst-kit.workspace = true
 
 typst-ansi-hl = "0.2.0"
 
@@ -100,9 +99,6 @@ dhat-heap = ["dhat"]
 # into the binary.
 embed-fonts = ["typst-assets/fonts"]
 
-# Whether to vendor OpenSSL. Not applicable to Windows and macOS builds.
-vendor-openssl = ["typst-kit/vendor-openssl"]
-
 # Disable the default content hint.
 # This requires modifying typst.
 no-content-hint = [

editors/vscode/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinymist",
-  "version": "0.12.4-rc2",
+  "version": "0.12.4-rc1",
   "description": "An integrated language service for Typst",
   "keywords": [
     "typst",

syntaxes/textmate/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typst-textmate",
-  "version": "0.12.4-rc2",
+  "version": "0.12.4-rc1",
   "private": true,
   "scripts": {
     "compile": "npx tsc && node ./dist/main.mjs",