Skip to content

Commit ba1acba

Browse files
committed
Merge branch 'master' into tstenner/outlet_sync
2 parents f87bc09 + 75119da commit ba1acba

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

.github/workflows/cppcmake.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
config:
3535
- {name: "ubuntu-20.04", os: "ubuntu-20.04", cmake_extra: "-DLSL_BUNDLED_PUGIXML=OFF"}
3636
- {name: "ubuntu-18.04", os: "ubuntu-latest", docker: "ubuntu:18.04" }
37+
- {name: "ubuntu-22.04", os: "ubuntu-latest", docker: "ubuntu:22.04" }
3738
- {name: "windows-x64", os: "windows-2019", cmake_extra: "-T v140,host=x86"}
3839
- {name: "windows-32", os: "windows-2019", cmake_extra: "-T v140,host=x86 -A Win32"}
3940
- {name: "macOS-latest", os: "macOS-latest"}
@@ -46,13 +47,15 @@ jobs:
4647
run: |
4748
apt update
4849
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
5054
if: ${{ matrix.config.docker }}
51-
5255
- name: Configure CMake
5356
run: |
5457
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
5659
fi
5760
cmake --version
5861
cmake -S . -B build \

0 commit comments

Comments
 (0)