Skip to content

Commit

Permalink
README/GitHub Actions: Use build/ directory instead of cmake_build/
Browse files Browse the repository at this point in the history
  • Loading branch information
Holzhaus committed Dec 7, 2020
1 parent cd3f39d commit a046cde
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
buildenv_basepath: /home/runner/buildenv
buildenv_script: tools/ubuntu_buildenv.sh
artifacts_name: Ubuntu 18.04 DEB
artifacts_path: cmake_build/*.deb
artifacts_path: build/*.deb
qt_qpa_platform: offscreen
- name: Ubuntu 20.04 (gcc)
os: ubuntu-20.04
Expand All @@ -45,7 +45,7 @@ jobs:
buildenv_basepath: /home/runner/buildenv
buildenv_script: tools/ubuntu_buildenv.sh
artifacts_name: Ubuntu 20.04 DEB
artifacts_path: cmake_build/*.deb
artifacts_path: build/*.deb
qt_qpa_platform: offscreen
- name: macOS 10.15
os: macos-10.15
Expand All @@ -62,7 +62,7 @@ jobs:
buildenv_basepath: /Users/runner/buildenv
buildenv_script: tools/macos_buildenv.sh
artifacts_name: macOS DMG
artifacts_path: cmake_build/*.dmg
artifacts_path: build/*.dmg
qt_qpa_platform: offscreen
- name: Windows 2019 (MSVC)
os: windows-2019
Expand All @@ -84,7 +84,7 @@ jobs:
buildenv_basepath: C:\buildenv
buildenv_script: tools/windows_buildenv.bat
artifacts_name: Windows Installer
artifacts_path: cmake_build/*.msi
artifacts_path: build/*.msi
qt_qpa_platform: windows

env:
Expand Down Expand Up @@ -182,7 +182,7 @@ jobs:
${{ matrix.os }}-${{ matrix.compiler_cache }}
- name: "Create build directory"
run: mkdir cmake_build
run: mkdir build

- name: "Configure"
run: >-
Expand All @@ -201,7 +201,7 @@ jobs:
-DQTKEYCHAIN=ON
-DVINYLCONTROL=ON
..
working-directory: cmake_build
working-directory: build
env:
CC: ${{ matrix.cc }}
CXX: ${{ matrix.cxx }}
Expand All @@ -216,7 +216,7 @@ jobs:

- name: "Build"
run: cmake --build .
working-directory: cmake_build
working-directory: build
env:
CC: ${{ matrix.cc }}
CXX: ${{ matrix.cxx }}
Expand All @@ -231,7 +231,7 @@ jobs:

- name: "Test"
run: ctest --timeout 45 ${{ matrix.ctest_args }}
working-directory: cmake_build
working-directory: build
env:
# Render analyzer waveform tests to an offscreen buffer
QT_QPA_PLATFORM: ${{ matrix.qt_qpa_platform }}
Expand All @@ -241,24 +241,24 @@ jobs:

- name: Benchmark
run: cmake --build . --target mixxx-benchmark
working-directory: cmake_build
working-directory: build
env:
# Render analyzer waveform tests to an offscreen buffer
QT_QPA_PLATFORM: ${{ matrix.qt_qpa_platform }}

- name: "Package"
run: cpack -G ${{ matrix.cpack_generator }} -V
working-directory: cmake_build
working-directory: build

- name: "[macOS] Sign Package"
if: runner.os == 'macOS' && env.MACOS_CODESIGN_OPENSSL_PASSWORD != null && env.MACOS_CODESIGN_CERTIFICATE_PASSWORD != null
run: codesign --verbose=4 --options runtime --sign "${APPLE_CODESIGN_IDENTITY}" --entitlements ../cmake/macos/entitlements.plist *.dmg
working-directory: cmake_build
working-directory: build

- name: "[Windows] Sign Package"
if: runner.os == 'Windows' && env.WINDOWS_CODESIGN_CERTIFICATE_PATH != null && env.WINDOWS_CODESIGN_CERTIFICATE_PASSWORD != null
run: signtool sign /f $Env:WINDOWS_CODESIGN_CERTIFICATE_PATH /p $Env:WINDOWS_CODESIGN_CERTIFICATE_PASSWORD *.msi
working-directory: cmake_build
working-directory: build

- name: "[macOS] Upload build to downloads.mixxx.org"
# skip deploying Ubuntu builds to downloads.mixxx.org because these are deployed to the PPA
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ bug list][easybugs] and get started!
First, you must install all of Mixxx's dependencies. To compile Mixxx using
[CMake], run:

$ mkdir cmake_build
$ cd cmake_build
$ mkdir build
$ cd build
$ cmake ..
$ cmake --build .

Expand Down

0 comments on commit a046cde

Please sign in to comment.