Skip to content

Commit 59870db

Browse files
committed
ci: Fix LSP workflow container matrix
1 parent 3192551 commit 59870db

1 file changed

Lines changed: 4 additions & 13 deletions

File tree

.github/workflows/lsp.yml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,41 +20,32 @@ jobs:
2020
settings:
2121
- host: macos-latest
2222
target: "x86_64-apple-darwin"
23-
container-options: "--rm"
2423
- host: macos-latest
2524
target: "aarch64-apple-darwin"
26-
container-options: "--rm"
2725
- host: ubuntu-latest
28-
container-options: "--platform=linux/amd64 --rm"
29-
container-setup: "sudo apt-get update && sudo apt-get install -y curl musl-tools"
26+
prepare: "sudo apt-get update && sudo apt-get install -y curl musl-tools"
3027
target: "x86_64-unknown-linux-musl"
3128
setup: "sudo apt-get install -y build-essential"
3229
- host: ubuntu-latest
33-
container-options: "--rm"
3430
target: "aarch64-unknown-linux-musl"
3531
rust-build-env: 'CC_aarch64_unknown_linux_musl=clang AR_aarch64_unknown_linux_musl=llvm-ar RUSTFLAGS="-Clink-self-contained=yes -Clinker=rust-lld"'
3632
setup: "sudo apt-get update && sudo apt-get install -y build-essential musl-tools clang llvm gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu"
3733
- host: windows-latest
3834
target: x86_64-pc-windows-msvc
3935
setup: "rustup set default-host x86_64-pc-windows-msvc"
40-
container-options: "--rm"
4136
- host: windows-latest
4237
target: aarch64-pc-windows-msvc
4338
setup: "rustup set default-host aarch64-pc-windows-msvc"
44-
container-options: "--rm"
4539
runs-on: ${{ matrix.settings.host }}
4640
timeout-minutes: 30
47-
container:
48-
image: ${{ matrix.settings.container }}
49-
options: ${{ matrix.settings.container-options }}
5041
steps:
5142
- name: Checkout repo
5243
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
5344
with:
5445
persist-credentials: false
55-
- name: Setup Container
56-
if: ${{ matrix.settings.container-setup }}
57-
run: ${{ matrix.settings.container-setup }}
46+
- name: Prepare build environment
47+
if: ${{ matrix.settings.prepare }}
48+
run: ${{ matrix.settings.prepare }}
5849

5950
- name: Setup capnproto
6051
uses: ./.github/actions/setup-capnproto

0 commit comments

Comments
 (0)