From 15c4ef3088ed3f416ba6ef052295c6c7c6da5e10 Mon Sep 17 00:00:00 2001
From: Luc Georges <McPatate@users.noreply.github.com>
Date: Sun, 10 Sep 2023 13:16:13 +0200
Subject: [PATCH] fix(ci): release workflow (#12)

---
 .github/workflows/release.yml | 75 +++++++++++++++--------------------
 crates/llm-ls/Cargo.toml      |  2 +-
 2 files changed, 34 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e19c035..a15e612 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -30,20 +30,19 @@ jobs:
           # - os: windows-latest
           #   target: aarch64-pc-windows-msvc
           #   code-target: win32-arm64
-          # - os: ubuntu-20.04
-          #   target: x86_64-unknown-linux-gnu
-          #   code-target: linux-x64
-          #   container: ubuntu:18.04
-          # - os: ubuntu-20.04
-          #   target: aarch64-unknown-linux-gnu
-          #   code-target: linux-arm64
-          # - os: ubuntu-20.04
-          #   target: arm-unknown-linux-gnueabihf
-          #   code-target: linux-armhf
-          - os: macos-11
+          - os: ubuntu-22.04
+            target: x86_64-unknown-linux-gnu
+            code-target: linux-x64
+          - os: ubuntu-22.04
+            target: aarch64-unknown-linux-gnu
+            code-target: linux-arm64
+          - os: ubuntu-22.04
+            target: arm-unknown-linux-gnueabihf
+            code-target: linux-armhf
+          - os: macos-12
             target: x86_64-apple-darwin
             code-target: darwin-x64
-          - os: macos-11
+          - os: macos-12
             target: aarch64-apple-darwin
             code-target: darwin-arm64
 
@@ -60,31 +59,23 @@ jobs:
         with:
           fetch-depth: ${{ env.FETCH_DEPTH }}
 
-      # - name: Install toolchain dependencies
-      #   if: matrix.container == 'ubuntu:18.04'
-      #   shell: bash
-      #   run: |
-      #     apt-get update && apt-get install -y build-essential curl
-      #     curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused -fsSL "https://sh.rustup.rs" | sh -s -- --profile minimal --default-toolchain none -y
-      #     echo "${CARGO_HOME:-$HOME/.cargo}/bin" >> $GITHUB_PATH
-
       - name: Install Rust toolchain
         run: |
           rustup update --no-self-update stable
           rustup target add ${{ matrix.target }}
           rustup component add rust-src
-      #
-      # - name: Update apt repositories
-      #   if: matrix.target == 'aarch64-unknown-linux-gnu' || matrix.target == 'arm-unknown-linux-gnueabihf'
-      #   run: sudo apt-get update
 
-      # - name: Install AArch64 target toolchain
-      #   if: matrix.target == 'aarch64-unknown-linux-gnu'
-      #   run: sudo apt-get install gcc-aarch64-linux-gnu
+      - name: Update apt repositories
+        if: contains(matrix.os, 'ubuntu')
+        run: sudo apt-get update -y
 
-      # - name: Install ARM target toolchain
-      #   if: matrix.target == 'arm-unknown-linux-gnueabihf'
-      #   run: sudo apt-get install gcc-multilib-arm-linux-gnueabihf
+      - name: Install AArch64 target toolchain
+        if: matrix.target == 'aarch64-unknown-linux-gnu'
+        run: sudo apt-get install gcc-aarch64-linux-gnu libc6-dev-arm64-cross
+
+      - name: Install ARM target toolchain
+        if: matrix.target == 'arm-unknown-linux-gnueabihf'
+        run: sudo apt-get install gcc-arm-linux-gnueabihf
 
       - name: Dist
         run: cargo xtask dist
@@ -152,22 +143,22 @@ jobs:
         with:
           name: dist-x86_64-apple-darwin
           path: dist
-      # - uses: actions/download-artifact@v1
-      #   with:
-      #     name: dist-x86_64-unknown-linux-gnu
-      #     path: dist
+      - uses: actions/download-artifact@v1
+        with:
+          name: dist-x86_64-unknown-linux-gnu
+          path: dist
       - uses: actions/download-artifact@v1
         with:
           name: dist-x86_64-unknown-linux-musl
           path: dist
-      # - uses: actions/download-artifact@v1
-      #   with:
-      #     name: dist-aarch64-unknown-linux-gnu
-      #     path: dist
-      # - uses: actions/download-artifact@v1
-      #   with:
-      #     name: dist-arm-unknown-linux-gnueabihf
-      #     path: dist
+      - uses: actions/download-artifact@v1
+        with:
+          name: dist-aarch64-unknown-linux-gnu
+          path: dist
+      - uses: actions/download-artifact@v1
+        with:
+          name: dist-arm-unknown-linux-gnueabihf
+          path: dist
       - uses: actions/download-artifact@v1
         with:
           name: dist-x86_64-pc-windows-msvc
diff --git a/crates/llm-ls/Cargo.toml b/crates/llm-ls/Cargo.toml
index 4f48529..fd803be 100644
--- a/crates/llm-ls/Cargo.toml
+++ b/crates/llm-ls/Cargo.toml
@@ -9,8 +9,8 @@ name = "llm-ls"
 [dependencies]
 home = "0.5"
 ropey = "1.6"
-serde = { version = "1", features = ["derive"] }
 reqwest = { version = "0.11", default-features = false, features = ["json", "rustls-tls"] }
+serde = { version = "1", features = ["derive"] }
 tokenizers = { version = "0.13", default-features = false, features = ["onig"] }
 tokio = { version = "1", features = ["fs", "io-std", "io-util", "macros", "rt-multi-thread"] }
 tower-lsp = "0.20"