Skip to content

Commit 7e84aec

Browse files
committed
fix: update Rust CI workflow for Ubuntu 22.04 compatibility
1 parent b80d44a commit 7e84aec

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

.github/workflows/rust.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ jobs:
1414
matrix:
1515
include:
1616
- target: x86_64-unknown-linux-gnu
17-
os: ubuntu-latest
17+
os: ubuntu-22.04
1818
name: linux-x86_64
1919
suffix: ''
2020
- target: aarch64-unknown-linux-gnu
21-
os: ubuntu-latest
21+
os: ubuntu-22.04-arm
2222
name: linux-aarch64
2323
suffix: ''
2424
- target: x86_64-apple-darwin
@@ -39,14 +39,14 @@ jobs:
3939
components: rustfmt
4040

4141
- name: Install system dependencies
42-
if: matrix.os == 'ubuntu-latest'
42+
if: matrix.os == 'ubuntu-22.04' || matrix.os == 'ubuntu-22.04-arm'
4343
run: |
4444
sudo apt-get update
4545
sudo apt-get install -y --no-install-recommends libclang-dev cmake g++
4646
sudo ln -sf /usr/bin/g++ /usr/bin/c++
4747
4848
- name: Install cross-compilation tools
49-
if: matrix.target == 'aarch64-unknown-linux-gnu'
49+
if: matrix.target == 'aarch64-unknown-linux-gnu' && matrix.os != 'ubuntu-22.04-arm'
5050
run: |
5151
sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
5252
sudo ln -sf /usr/bin/aarch64-linux-gnu-g++ /usr/bin/aarch64-linux-gnu-c++
@@ -77,12 +77,12 @@ jobs:
7777
command: build
7878
args: '--release --target ${{ matrix.target }}'
7979
env:
80-
CC_aarch64_unknown_linux_gnu: aarch64-linux-gnu-gcc
81-
CXX_aarch64_unknown_linux_gnu: aarch64-linux-gnu-g++
82-
AR_aarch64_unknown_linux_gnu: aarch64-linux-gnu-ar
83-
CMAKE_CXX_COMPILER_aarch64_unknown_linux_gnu: aarch64-linux-gnu-g++
84-
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
85-
RUSTFLAGS_aarch64_unknown_linux_gnu: -C linker=aarch64-linux-gnu-gcc
80+
CC_aarch64_unknown_linux_gnu: ${{ matrix.os != 'ubuntu-22.04-arm' && 'aarch64-linux-gnu-gcc' || 'gcc' }}
81+
CXX_aarch64_unknown_linux_gnu: ${{ matrix.os != 'ubuntu-22.04-arm' && 'aarch64-linux-gnu-g++' || 'g++' }}
82+
AR_aarch64_unknown_linux_gnu: ${{ matrix.os != 'ubuntu-22.04-arm' && 'aarch64-linux-gnu-ar' || 'ar' }}
83+
CMAKE_CXX_COMPILER_aarch64_unknown_linux_gnu: ${{ matrix.os != 'ubuntu-22.04-arm' && 'aarch64-linux-gnu-g++' || 'g++' }}
84+
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: ${{ matrix.os != 'ubuntu-22.04-arm' && 'aarch64-linux-gnu-gcc' || 'gcc' }}
85+
RUSTFLAGS_aarch64_unknown_linux_gnu: ${{ matrix.os != 'ubuntu-22.04-arm' && '-C linker=aarch64-linux-gnu-gcc' || '' }}
8686
CXXFLAGS: -std=c++17 -include cstdint -include cinttypes
8787
CXXFLAGS_aarch64_unknown_linux_gnu: -std=c++17 -include cstdint -include cinttypes
8888
ROCKSDB_DISABLE_JEMALLOC: 1

0 commit comments

Comments
 (0)