Skip to content

Commit edc2ca0

Browse files
fix build
1 parent a5e0f04 commit edc2ca0

File tree

1 file changed

+17
-22
lines changed

1 file changed

+17
-22
lines changed

.github/workflows/build-scuffle.yaml

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -24,68 +24,63 @@ jobs:
2424
strategy:
2525
matrix:
2626
include:
27-
- runner: ubuntu-22.04
27+
- runner: ubuntu-24.04
2828
os: linux
2929
arch: x86_64
30-
target: x86_64-unknown-linux-gnu
31-
container: quay.io/pypa/manylinux_2_28_x86_64
32-
- runner: ubuntu-22.04-arm
30+
- runner: ubuntu-24.04-arm
3331
os: linux
3432
arch: aarch64
35-
target: aarch64-unknown-linux-gnu
36-
container: quay.io/pypa/manylinux_2_28_aarch64
3733
- runner: windows-2022
3834
os: windows
3935
arch: x86_64
40-
target: x86_64-pc-windows-msvc
41-
- runner: macos-13
36+
- runner: windows-11-arm
37+
os: windows
38+
arch: aarch64
39+
- runner: macos-15-intel
4240
os: darwin
4341
arch: x86_64
44-
target: x86_64-apple-darwin
45-
- runner: macos-14
42+
- runner: macos-15
4643
os: darwin
4744
arch: aarch64
48-
target: aarch64-apple-darwin
4945

5046
runs-on: ${{ matrix.runner }}
51-
container: ${{ matrix.container }}
5247
env:
5348
NAME: "rust-analyzer-${{ matrix.os }}-${{ matrix.arch }}"
54-
RA_TARGET: ${{ matrix.target }}
5549
steps:
5650
- uses: actions/checkout@v4
5751
with:
5852
fetch-depth: ${{ env.FETCH_DEPTH }}
5953

60-
- name: Install zstd
54+
- name: Install zstd (Linux)
55+
if: ${{ runner.os == 'Linux' }}
56+
run: sudo apt-get update && sudo apt-get install -y zstd
57+
58+
- name: Install zstd (Windows)
6159
if: ${{ runner.os == 'Windows' }}
6260
uses: MinoruSekine/setup-scoop@v4.0.2
6361
with:
6462
buckets: main
6563
apps: zstd
6664

67-
- name: Install rustup
68-
if: ${{ matrix.container }}
69-
run: |
70-
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal
71-
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
65+
- name: Install zstd (macOS)
66+
if: ${{ runner.os == 'macOS' }}
67+
run: brew install zstd
7268

7369
- name: Install Rust toolchain
7470
run: |
7571
rustup update --no-self-update stable
7672
rustup component add rust-src
77-
rustup target add ${{ matrix.target }}
7873
7974
- name: Build rust-analyzer
80-
run: cargo xtask dist --client-patch-version ${{ github.run_number }}
75+
run: cargo build --manifest-path ./crates/rust-analyzer/Cargo.toml --bin rust-analyzer --release
8176

8277
- name: Generate archive
8378
run: |
8479
mkdir -p artifacts-archive
8580
BIN_NAME="rust-analyzer${{ runner.os == 'Windows' && '.exe' || '' }}"
8681
8782
mkdir -p "${NAME}"
88-
cp "dist/${BIN_NAME}" "${NAME}/"
83+
cp "target/release/${BIN_NAME}" "${NAME}/"
8984
9085
tar -cf - "${NAME}" | zstd --ultra -22 -o "artifacts-archive/${NAME}.tar.zst"
9186

0 commit comments

Comments
 (0)