From cb4a83e4091fd5e7f7d09b268237efb78b340b6a Mon Sep 17 00:00:00 2001
From: Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de>
Date: Mon, 14 Dec 2020 10:42:24 +0100
Subject: Remove SCons

- Move packaging files from packaging/ directory
- Tidy up cmake/ directory
- Remove obsolete files from the build directory
---
 .github/workflows/build.yml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 285a046092..3567dcf9d5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -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
@@ -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
@@ -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
@@ -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:
@@ -133,7 +133,7 @@ jobs:
         # Decrypt the certificate
         openssl enc -aes-256-cbc -d -md sha512 \
           -k "${MACOS_CODESIGN_OPENSSL_PASSWORD}" \
-          -in /Users/runner/work/mixxx/mixxx/cmake/macos_developer_id_codesign_certificate.p12.enc \
+          -in /Users/runner/work/mixxx/mixxx/packaging/certificates/macos_developer_id_codesign_certificate.p12.enc \
           -out ~/certificate.p12
 
         # Create a temporary keychain for the certificate and import it.
@@ -182,7 +182,7 @@ jobs:
           ${{ matrix.os }}-${{ matrix.compiler_cache }}
 
     - name: "Create build directory"
-      run: mkdir cmake_build
+      run: mkdir build
 
     - name: "Configure"
       run: >-
@@ -201,7 +201,7 @@ jobs:
         -DQTKEYCHAIN=ON
         -DVINYLCONTROL=ON
         ..
-      working-directory: cmake_build
+      working-directory: build
       env:
         CC: ${{ matrix.cc }}
         CXX: ${{ matrix.cxx }}
@@ -216,7 +216,7 @@ jobs:
 
     - name: "Build"
       run: cmake --build .
-      working-directory: cmake_build
+      working-directory: build
       env:
         CC: ${{ matrix.cc }}
         CXX: ${{ matrix.cxx }}
@@ -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 }}
@@ -241,29 +241,29 @@ 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: "Package for PPA"
       if: startsWith(matrix.os, 'ubuntu')
       run: cpack -G External -D DEB_SOURCEPKG=ON
-      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 ../build/osx/entitlements.plist *.dmg
-      working-directory: cmake_build
+      run: codesign --verbose=4 --options runtime --sign "${APPLE_CODESIGN_IDENTITY}" --entitlements ../packaging/macos/entitlements.plist *.dmg
+      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
@@ -273,7 +273,7 @@ jobs:
         FILE_TO_DEPLOY: ${{ matrix.artifacts_path }}
         OS: ${{ runner.os }}
         DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY_PASSWORD: ${{ secrets.DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY_PASSWORD }}
-        SSH_KEY: build/certificates/downloads-hostgator.mixxx.org.key
+        SSH_KEY: packaging/certificates/downloads-hostgator.mixxx.org.key
 
     - name: "Upload GitHub Actions artifacts"
       uses: actions/upload-artifact@v2
-- 
cgit v1.2.3