Replace config.toml with env variables (#1237)

latex-lsp · Oct 15, 2024 · 4a25391 · 4a25391
1 parent c9ee5b1
commit 4a25391
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,6 +10,8 @@ env:
   CI: 1
   RUST_BACKTRACE: short
   RUSTFLAGS: "-D warnings"
+  CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: "aarch64-linux-gnu-gcc"
+  CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER: "arm-linux-gnueabihf-gcc"
 jobs:
   build:
     name: Build (${{ matrix.target }})
@@ -42,11 +44,9 @@ jobs:
 
           - os: ubuntu-20.04
             target: aarch64-unknown-linux-gnu
-            install: sudo apt-get install -y gcc-aarch64-linux-gnu
 
           - os: ubuntu-20.04
             target: armv7-unknown-linux-gnueabihf
-            install: sudo apt-get install -y gcc-arm-linux-gnueabihf
 
           - os: ubuntu-20.04
             target: x86_64-unknown-linux-musl
@@ -57,8 +57,8 @@ jobs:
           targets: ${{ matrix.target }}
       - uses: Swatinem/rust-cache@v2
       - name: Install cross-compilation dependencies
-        run: ${{ matrix.install }}
-        if: ${{ matrix.install }}
+        run: sudo apt-get install -y gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf
+        if: ${{ matrix.os == 'ubuntu-20.04' }}
       - name: Compile
         run: cargo test --target ${{ matrix.target }} --all-features --no-run --locked
       - name: Test

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -7,6 +7,8 @@ env:
   CI: 1
   RUST_BACKTRACE: short
   RUSTFLAGS: "-D warnings"
+  CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: "aarch64-linux-gnu-gcc"
+  CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER: "arm-linux-gnueabihf-gcc"
 jobs:
   build:
     name: Build (${{ matrix.archive  }})
@@ -41,12 +43,10 @@ jobs:
           - os: ubuntu-20.04
             target: aarch64-unknown-linux-gnu
             archive: texlab-aarch64-linux.tar.gz
-            install: sudo apt-get install -y gcc-aarch64-linux-gnu
 
           - os: ubuntu-20.04
             target: armv7-unknown-linux-gnueabihf
             archive: texlab-armv7hf-linux.tar.gz
-            install: sudo apt-get install -y gcc-arm-linux-gnueabihf
 
           - os: ubuntu-20.04
             target: x86_64-unknown-linux-musl
@@ -57,8 +57,8 @@ jobs:
         with:
           targets: ${{ matrix.target }}
       - name: Install cross-compilation dependencies
-        run: ${{ matrix.install }}
-        if: ${{ matrix.install }}
+        run: sudo apt-get install -y gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf
+        if: ${{ matrix.os == 'ubuntu-20.04' }}
       - name: Compile
         run: cargo build --target ${{ matrix.target }} --all-features --release --locked
       - name: Compress (Windows)