diff options
| author | Arisotura <thetotalworm@gmail.com> | 2020-05-30 03:19:20 +0200 |
|---|---|---|
| committer | Arisotura <thetotalworm@gmail.com> | 2020-05-30 03:19:20 +0200 |
| commit | b62d90cbe4c5232f0fe8604bd5e11f8eccd48ba1 (patch) | |
| tree | bfd0a5e6f30fc382170ec9402adea32f12ebc342 /.github/workflows/build-ubuntu.yml | |
| parent | 82302c9bf48598f889d0942340c224852c1378c5 (diff) | |
| parent | 993048dd241b59747a7b30edfc861eedd4c005c9 (diff) | |
Merge remote-tracking branch 'remotes/origin/master' into melonDSi
Diffstat (limited to '.github/workflows/build-ubuntu.yml')
| -rw-r--r-- | .github/workflows/build-ubuntu.yml | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml index fed0f3e..efb9604 100644 --- a/.github/workflows/build-ubuntu.yml +++ b/.github/workflows/build-ubuntu.yml @@ -1,6 +1,12 @@ name: CMake Build (Ubuntu x86-64) -on: [push, pull_request] +on: + push: + branches: + - master + pull_request: + branches: + - master env: BUILD_TYPE: Release @@ -21,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 @@ -34,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 |