File tree 1 file changed +6
-3
lines changed
1 file changed +6
-3
lines changed Original file line number Diff line number Diff line change 34
34
config :
35
35
- {name: "ubuntu-20.04", os: "ubuntu-20.04", cmake_extra: "-DLSL_BUNDLED_PUGIXML=OFF"}
36
36
- {name: "ubuntu-18.04", os: "ubuntu-latest", docker: "ubuntu:18.04" }
37
+ - {name: "ubuntu-22.04", os: "ubuntu-latest", docker: "ubuntu:22.04" }
37
38
- {name: "windows-x64", os: "windows-2019", cmake_extra: "-T v140,host=x86"}
38
39
- {name: "windows-32", os: "windows-2019", cmake_extra: "-T v140,host=x86 -A Win32"}
39
40
- {name: "macOS-latest", os: "macOS-latest"}
@@ -46,13 +47,15 @@ jobs:
46
47
run : |
47
48
apt update
48
49
apt install -y --no-install-recommends g++ git python3-pip ninja-build file dpkg-dev lsb-release sudo curl
49
- python3 -m pip install cmake
50
+ if [[ "$(apt search cmake | grep ^cmake/ | cut -d" " -f 2 | sort -V | tail -1 | cut -d. -f-2)" == 3.10 ]]
51
+ then python3 -m pip install cmake
52
+ else apt install -y --no-install-recommends cmake libpugixml-dev
53
+ fi
50
54
if : ${{ matrix.config.docker }}
51
-
52
55
- name : Configure CMake
53
56
run : |
54
57
if [[ "${{ matrix.config.os }}" == "ubuntu-20.04" ]]; then
55
- sudo apt-get install libpugixml-dev
58
+ sudo apt-get install -y --no-install-recommends libpugixml-dev
56
59
fi
57
60
cmake --version
58
61
cmake -S . -B build \
You can’t perform that action at this time.
0 commit comments