Skip to content

Commit bc99046

Browse files
committed
correct script path for arm vs amd cmake install
1 parent 4473722 commit bc99046

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

.github/workflows/linux.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
target: ["release","debug"]
22-
os: ["ubuntu-24.04","ubuntu-24.04-arm"]
22+
os: ["ubuntu-22.04","ubuntu-22.04-arm"]
2323

2424
runs-on: ${{matrix.os}}
2525
steps:
@@ -38,9 +38,11 @@ jobs:
3838
set +xe
3939
which cmake &> /dev/null
4040
if [ $? -ne 0 ]; then
41-
wget https://github.com/Kitware/CMake/releases/download/v3.31.5/cmake-3.31.5-linux-x86_64.sh
42-
chmod +x cmake-3.31.5-linux-x86_64.sh
43-
sudo ./cmake-3.31.5-linux-x86_64.sh --skip-license --prefix=/usr/local
41+
arch=$([ $(uname -m) = "arm64" ] && echo "aarch64" || echo "x86_64")
42+
cmake_script="cmake-3.31.5-linux-$arch.sh"
43+
wget "https://github.com/Kitware/CMake/releases/download/v3.31.5/$cmake_script"
44+
chmod +x $cmake_script
45+
sudo ./$cmake_script --skip-license --prefix=/usr/local
4446
fi
4547
CMAKE_VERSION=$(cmake --version | awk '/version/ {print $3}')
4648
echo "Using cmake: ${CMAKE_VERSION}"

0 commit comments

Comments
 (0)