diff options
| author | Nadia Holmquist Pedersen <nadia@nhp.sh> | 2020-06-03 13:54:28 +0200 |
|---|---|---|
| committer | Nadia Holmquist Pedersen <nadia@nhp.sh> | 2020-06-03 13:54:28 +0200 |
| commit | f9f366e296a68be0aa2eb7bfd0552da31896a18c (patch) | |
| tree | f52760d5505b84074a9c1b50b4fe16e40035ba06 /.github/workflows/build-ubuntu.yml | |
| parent | b746c0b7279d1f5b4bcfd02c115b09d583e9df4f (diff) | |
| parent | d6332f96f162849ad0dde2738cacd3fae6e76e5d (diff) | |
Merge remote-tracking branch 'remotes/upstream/master' into feature/qt-platform
# Conflicts:
# src/frontend/qt_sdl/CMakeLists.txt
# src/frontend/qt_sdl/Platform.cpp
# src/frontend/qt_sdl/main.cpp
Diffstat (limited to '.github/workflows/build-ubuntu.yml')
| -rw-r--r-- | .github/workflows/build-ubuntu.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml index b57c5b7..efb9604 100644 --- a/.github/workflows/build-ubuntu.yml +++ b/.github/workflows/build-ubuntu.yml @@ -27,7 +27,7 @@ jobs: && 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 apt-get update \ - && sudo apt-get install gtk+-3.0 libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev + && sudo apt-get install gtk+-3.0 libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev qt5-default - name: Create build environment run: mkdir ${{runner.workspace}}/build - name: Configure @@ -40,7 +40,7 @@ jobs: run: | make -j$(nproc --all) \ && mkdir dist \ - && cp {melonDS,romlist.bin} dist + && cp melonDS dist - uses: actions/upload-artifact@v1 with: name: melonDS |