diff options
author | Swiftb0y <12380386+Swiftb0y@users.noreply.github.com> | 2023-06-04 22:04:00 +0200 |
---|---|---|
committer | Swiftb0y <12380386+Swiftb0y@users.noreply.github.com> | 2023-06-04 22:04:00 +0200 |
commit | 585519d0ef1b76c1d5973c95c80b3ff31f1b5c72 (patch) | |
tree | 783691e67fa98cbcb7f94a59a5ca2ed04113252e /.github/workflows/build.yml | |
parent | 4a3a8dc39ef3c81d74eec4cd03916d3381ec4c0b (diff) | |
parent | ca1ba2f74356fb9b5907333fe3692185cfe78201 (diff) |
Merge remote-tracking branch 'upstream/2.4'
Diffstat (limited to '.github/workflows/build.yml')
-rw-r--r-- | .github/workflows/build.yml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 78e09e48b8..826ad138c4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -109,6 +109,7 @@ jobs: # also adjust the for the local Windows build setup in # ./tools/windows_buildenv.bat cmake_args: >- + -DWARNINGS_FATAL=ON -DBULK=OFF -DFFMPEG=OFF -DHSS1394=ON @@ -354,7 +355,9 @@ jobs: if: matrix.name == 'Ubuntu 22.04 (gcc)' run: | if [[ "${{ github.ref }}" == "refs/heads/main" ]] && [[ "${{ github.repository }}" == "mixxxdj/mixxx" ]]; then - CPACK_ARGS="-D DEB_UPLOAD_PPA=ppa:mixxx/nightlies -D CPACK_DEBIAN_DEBIAN_VERSION=0ubuntu2" + CPACK_ARGS="-D DEB_UPLOAD_PPA=ppa:mixxx/nightlies" + elif [[ "${{ github.ref }}" == "refs/heads/2.4" ]] && [[ "${{ github.repository }}" == "mixxxdj/mixxx" ]]; then + CPACK_ARGS="-D DEB_UPLOAD_PPA=ppa:mixxx/mixxxbetas" elif [[ "${{ github.ref }}" =~ ^refs/tags/[0-9]+\.[0-9]+\.[0-9]+$ ]] && [[ "${{ github.repository }}" == "mixxxdj/mixxx" ]]; then CPACK_ARGS="-D DEB_UPLOAD_PPA=ppa:mixxx/mixxx" else |