Skip to content

Commit 899beb9

Browse files
committed
chore(ci): update rust workflow with specific macos version and improved aarch64 cross-compilation setup
1 parent 6133168 commit 899beb9

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

.github/workflows/rust.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
name: linux-aarch64
2323
suffix: ''
2424
- target: x86_64-apple-darwin
25-
os: macos-latest
25+
os: macos-13
2626
name: macos
2727
suffix: ''
2828

@@ -42,11 +42,13 @@ jobs:
4242
run: |
4343
sudo apt-get update
4444
sudo apt-get install -y --no-install-recommends libclang-dev cmake g++
45+
sudo ln -sf /usr/bin/g++ /usr/bin/c++
4546
4647
- name: Install cross-compilation tools
4748
if: matrix.target == 'aarch64-unknown-linux-gnu'
4849
run: |
4950
sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
51+
sudo ln -sf /usr/bin/aarch64-linux-gnu-g++ /usr/bin/aarch64-linux-gnu-c++
5052
rustup target add aarch64-unknown-linux-gnu
5153
5254
- name: Add targets
@@ -78,6 +80,8 @@ jobs:
7880
CXX_aarch64_unknown_linux_gnu: aarch64-linux-gnu-g++
7981
AR_aarch64_unknown_linux_gnu: aarch64-linux-gnu-ar
8082
CMAKE_CXX_COMPILER_aarch64_unknown_linux_gnu: aarch64-linux-gnu-g++
83+
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
84+
RUSTFLAGS_aarch64_unknown_linux_gnu: -C linker=aarch64-linux-gnu-gcc
8185

8286
- name: Package
8387
shell: bash

0 commit comments

Comments
 (0)