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 | |
| parent | 5c08207f359479fdd16fa8517f9d2a5e8fe52c63 (diff) | |
| parent | dff14ca80ada883870131c7ff17d85866254ccc0 (diff) | |
Merge branch 'master' into fix/aarch64-ci
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build-ubuntu-aarch64.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/build-ubuntu.yml | 8 | ||||
| -rw-r--r-- | .github/workflows/build-windows.yml | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/.github/workflows/build-ubuntu-aarch64.yml b/.github/workflows/build-ubuntu-aarch64.yml index e6d4a87..8ece6f2 100644 --- a/.github/workflows/build-ubuntu-aarch64.yml +++ b/.github/workflows/build-ubuntu-aarch64.yml @@ -32,7 +32,7 @@ jobs: sudo rm /etc/apt/sources.list sudo mv /etc/apt/sources.list{.new,} sudo apt update - sudo apt install {gcc-10,g++-10,pkg-config}-aarch64-linux-gnu libsdl2-dev:arm64 qtbase5-dev:arm64 + sudo apt install {gcc-10,g++-10,pkg-config}-aarch64-linux-gnu libsdl2-dev:arm64 qtbase5-dev:arm64 libslirp-dev:arm64 - name: Create build environment run: mkdir ${{runner.workspace}}/build - name: Configure 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 diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 035bc54..bbf68af 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -24,7 +24,7 @@ jobs: choco install msys2 C:\tools\msys64\usr\bin\bash.exe -lc "pacman -Syuq --noconfirm" - name: Install dependencies - run: C:\tools\msys64\usr\bin\bash.exe -lc "pacman -Sq --noconfirm git make mingw-w64-x86_64-{cmake,mesa,SDL2,qt5-static,toolchain}" + run: C:\tools\msys64\usr\bin\bash.exe -lc "pacman -Sq --noconfirm git make mingw-w64-x86_64-{cmake,mesa,SDL2,qt5-static,libslirp,toolchain}" - name: Create build environment run: | New-Item -ItemType directory -Path ${{runner.workspace}}\melonDS\build |