diff options
author | Nadia Holmquist Pedersen <nadia@nhp.sh> | 2020-07-26 21:52:35 +0200 |
---|---|---|
committer | Nadia Holmquist Pedersen <nadia@nhp.sh> | 2020-07-26 21:52:35 +0200 |
commit | c547db21e9d41f3a1897ce3ab4872b8aa7f8d31f (patch) | |
tree | d43965758ada46e713822c32288304f082fd4772 /.github/workflows | |
parent | c9b9f43fbf7ff0367d16d81269e38c3b618bfa65 (diff) |
Don't download CMake, the package is new enough
Diffstat (limited to '.github/workflows')
-rw-r--r-- | .github/workflows/build-ubuntu.yml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml index fb3e576..5974c69 100644 --- a/.github/workflows/build-ubuntu.yml +++ b/.github/workflows/build-ubuntu.yml @@ -23,17 +23,15 @@ jobs: shell: bash working-directory: ${{runner.workspace}} run: | # Fetch a new version of CMake, because the default is too old. - wget -nv https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-Linux-x86_64.tar.gz \ - && tar -zxf cmake-$CMAKE_VERSION-Linux-x86_64.tar.gz \ - && sudo rm -f /etc/apt/sources.list.d/dotnetdev.list /etc/apt/sources.list.d/microsoft-prod.list \ + sudo rm -f /etc/apt/sources.list.d/dotnetdev.list /etc/apt/sources.list.d/microsoft-prod.list \ && sudo apt-get update \ - && sudo apt-get install libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev qt5-default libslirp-dev + && sudo apt-get install cmake libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev qt5-default libslirp-dev - name: Create build environment run: mkdir ${{runner.workspace}}/build - name: Configure shell: bash working-directory: ${{runner.workspace}}/build - run: ${{runner.workspace}}/cmake-$CMAKE_VERSION-Linux-x86_64/bin/cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE + run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE - name: Make shell: bash working-directory: ${{runner.workspace}}/build |