diff options
| author | Nadia Holmquist Pedersen <nadia@nhp.sh> | 2020-07-27 16:06:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-27 16:06:53 +0200 |
| commit | 40a9f41be8ec484728862eb065b9b6985909db33 (patch) | |
| tree | a037a722e60dc06a8de6990ce9da0c50f2d7015f /.github/workflows/build-ubuntu.yml | |
| parent | 5c08207f359479fdd16fa8517f9d2a5e8fe52c63 (diff) | |
| parent | dff14ca80ada883870131c7ff17d85866254ccc0 (diff) | |
Merge branch 'master' into fix/aarch64-ci
Diffstat (limited to '.github/workflows/build-ubuntu.yml')
| -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 4ecdae0..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 gtk+-3.0 libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev qt5-default + && 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 |