@@ -34,27 +34,29 @@ 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 " }
37+ - {name: "ubuntu-22.04", os: "ubuntu-22.04 ", cmake_extra : "-DLSL_BUNDLED_PUGIXML=OFF " }
3838 - {name: "windows-x64", os: "windows-2019", cmake_extra: "-T v140,host=x86"}
3939 - {name: "windows-32", os: "windows-2019", cmake_extra: "-T v140,host=x86 -A Win32"}
4040 - {name: "macOS-latest", os: "macOS-latest"}
4141
4242 # runs all steps in the container configured in config.docker or as subprocesses when empty
4343 container : ${{ matrix.config.docker }}
4444 steps :
45- - uses : actions/checkout@v2
45+ - uses : actions/checkout@v3
4646 - name : set up build environment in container
4747 run : |
48+ set -x
4849 apt update
49- apt install -y --no-install-recommends g++ git python3-pip ninja-build file dpkg-dev lsb-release sudo curl
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
50+ apt install -y --no-install-recommends g++ git ninja-build file dpkg-dev lsb-release sudo curl
51+ if [[ "${{ matrix.config.name }}" = "ubuntu-18.04" ]]; then
52+ curl -sSkL https://github.com/Kitware/CMake/releases/download/v3.25.1/cmake-3.25.1-linux-x86_64.tar.gz | \
53+ tar -xzf - -C /usr --strip-components=1
5254 else apt install -y --no-install-recommends cmake libpugixml-dev
5355 fi
5456 if : ${{ matrix.config.docker }}
5557 - name : Configure CMake
5658 run : |
57- if [[ "${{ matrix.config.os }}" == " ubuntu-20.04" ]]; then
59+ if [[ "${{ matrix.config.name }}" = ubuntu-2* ]]; then
5860 sudo apt-get install -y --no-install-recommends libpugixml-dev
5961 fi
6062 cmake --version
0 commit comments