Enable CMake workflows for Windows/Linux x64/arm64

mos9527 · mos9527 · commit 2c2d73fd5edc · 2025-11-04T09:20:02.000+08:00
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -3,14 +3,13 @@ name: Build
 on:
   push:
     branches:
-    - master
+    - rewrite
   pull_request:
     branches:
-    - master
+    - rewrite
   workflow_dispatch:
 
-env:
-  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+env:  
   BUILD_TYPE: RelWithDebInfo
 
 jobs:
@@ -21,24 +20,31 @@ jobs:
         include:
           - os: ubuntu-24.04
             arch: x64
-            binary_path: build/SonyHeadphonesClient
+            binary_path: build/client/SonyHeadphonesClient
             artifact_name: "SonyHeadphonesClient-linux-x64"
-            script: "sudo apt-get update && sudo apt-get install libbluetooth-dev libdbus-1-dev libwayland-dev libxkbcommon-dev wayland-protocols extra-cmake-modules xorg-dev"
+            script: "sudo apt-get update && sudo apt-get install -y libbluetooth-dev libdbus-1-dev libwayland-dev libxkbcommon-dev wayland-protocols extra-cmake-modules xorg-dev llvm-18-dev libclang-18-dev libcurl4-openssl-dev"
             gcc: 14
+          # ARM Linux runners currently has availablity issues.
+          # TODO: Enable these once these are fixed.
+          #   https://github.com/actions/partner-runner-images/issues/132
+          #   https://github.com/actions/partner-runner-images/issues/65
+          # - os: ubuntu-24.04-arm64
+          #   arch: arm64
+          #   binary_path: build/client/SonyHeadphonesClient
+          #   artifact_name: "SonyHeadphonesClient-linux-arm64"
+          #   script: "sudo apt-get update && sudo apt-get install -y libbluetooth-dev libdbus-1-dev libwayland-dev libxkbcommon-dev wayland-protocols extra-cmake-modules xorg-dev llvm-18-dev libclang-18-dev libcurl4-openssl-dev"
+          #   gcc: 14
           - os: windows-latest
             arch: x64
-            binary_path: build/RelWithDebInfo/SonyHeadphonesClient.exe
+            binary_path: build/client/RelWithDebInfo/SonyHeadphonesClient.exe
             artifact_name: "SonyHeadphonesClient-win-x64"
             script: ""
           - os: windows-latest
-            arch: ARM64
-            binary_path: build/RelWithDebInfo/SonyHeadphonesClient.exe
+            arch: arm64
+            binary_path: build/client/RelWithDebInfo/SonyHeadphonesClient.exe
             artifact_name: "SonyHeadphonesClient-win-arm64"
             script: ""
-          - os: macos-latest
-            arch: universal
-            binary_path: build/SonyHeadphonesClient.zip
-            artifact_name: "SonyHeadphonesClient-macOS"
+
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -54,128 +60,35 @@ jobs:
       # We'll use this as our working directory for all subsequent commands
       run: cmake -E make_directory ${{github.workspace}}/build
 
-    - name: Configure CMake
-      # Use a bash shell so we can use the same syntax for environment variable
-      # access regardless of the host operating system
-      shell: bash
-      working-directory: ${{github.workspace}}/build
-      # Note the current convention is to use the -S and -B options here to specify source
-      # and build directories, but this is only available with CMake 3.13 and higher.
-      # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
-      run: |
-        if [[ "${{ matrix.os }}" == "windows-latest" ]]; then
-          cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -A ${{ matrix.arch }}
-        else
-          cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE
-        fi
-
-    - name: Configure CMake (macOS)
-      if: runner.os == 'macOS'
-      # Use a bash shell so we can use the same syntax for environment variable
-      # access regardless of the host operating system
-      shell: bash
-      working-directory: ${{github.workspace}}/build
-      # Note the current convention is to use the -S and -B options here to specify source
-      # and build directories, but this is only available with CMake 3.13 and higher.
-      # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
-      run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
-
+    - name: Configure CMake (Windows)
+      working-directory: ${{github.workspace}}/build    
+      if: runner.os == 'Windows'
+      run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -A ${{ matrix.arch }}
+    
+    - name: Configure CMake (Linux)
+      env:
+        CC: gcc-${{ matrix.gcc }}
+        CXX: g++-${{ matrix.gcc }}
+      working-directory: ${{github.workspace}}/build    
+      if: runner.os == 'Linux'
+      run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+    
     - name: Build
       working-directory: ${{github.workspace}}/build
       shell: bash
       # Execute the build.  You can specify a specific target with "--target <NAME>"
-      run: cmake --build . --config $BUILD_TYPE
-
-    - name: Zip the App Bundle (macOS)
-      if: runner.os == 'macOS'
-      working-directory: ${{github.workspace}}/build
-      # Zip the application for easier downloading
-      run: zip -r SonyHeadphonesClient.zip SonyHeadphonesClient.app
+      run: cmake --build . --config $BUILD_TYPE --target SonyHeadphonesClient
 
     - name: Strip Symbols (Linux)
       if: runner.os == 'Linux'
-      working-directory: ${{github.workspace}}/build
+      working-directory: ${{github.workspace}}
       # Strip symbols from the binary to reduce size
-      run: strip --strip-unneeded SonyHeadphonesClient
+      run: strip --strip-unneeded ${{matrix.binary_path}}
 
     - name: Upload a Build Artifact
       uses: actions/upload-artifact@v4
       with:
         # Artifact name
         name: ${{ matrix.artifact_name }}
         # A file, directory or wildcard pattern that describes what to upload
-        path: ${{github.workspace}}/${{matrix.binary_path}}
-        # The desired behavior if no files are found using the provided path.
-
-  release:
-    name: Release
-    if: "contains(github.event.head_commit.message, 'Version')"
-    needs: ["build"]
-    runs-on: ubuntu-latest
-
-    steps:
-    - name : Get Version
-      id   : get_version
-      run  : |        
-        version=$(echo "${{ github.event.head_commit.message }}" | awk 'NR==1' | awk '{print $2}')
-        echo "::set-output name=version::$version"
-
-    - uses: actions/checkout@v3
-
-    - name: Create Release
-      id: create_release
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: ${{ steps.get_version.outputs.version }}
-        release_name: Version ${{ steps.get_version.outputs.version }}
-
-    - uses: actions/download-artifact@v4
-      with:
-        path: ${{github.workspace}}/artifacts
-
-    - name: Display structure of downloaded files
-      run: ls -R ${{github.workspace}}/artifacts
-
-    - uses: actions/upload-release-asset@v1.0.1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ${{github.workspace}}/artifacts/SonyHeadphonesClient-linux-x64/SonyHeadphonesClient
-        asset_name: SonyHeadphonesClient-linux-x64
-        asset_content_type: application/octet-stream
-
-    - uses: actions/upload-release-asset@v1.0.1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ${{github.workspace}}/artifacts/SonyHeadphonesClient-win-x64/SonyHeadphonesClient.exe
-        asset_name: SonyHeadphonesClient-win-x64.exe
-        asset_content_type: application/vnd.microsoft.portable-executable
-
-    - uses: actions/upload-release-asset@v1.0.1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ${{github.workspace}}/artifacts/SonyHeadphonesClient-win-arm64/SonyHeadphonesClient.exe
-        asset_name: SonyHeadphonesClient-win-arm64.exe
-        asset_content_type: application/vnd.microsoft.portable-executable
-
-    - uses: actions/upload-release-asset@v1.0.1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ${{github.workspace}}/artifacts/SonyHeadphonesClient-macOS/SonyHeadphonesClient.zip
-        asset_name: SonyHeadphonesClient-macOS.zip
-        asset_content_type: application/zip
-
-    - uses: eregon/publish-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        release_id: ${{ steps.create_release.outputs.id }}
+        path: ${{github.workspace}}/${{matrix.binary_path}}
diff --git a/README.md b/README.md
@@ -3,6 +3,16 @@ SonyHeadphonesClient
 
 A spiritual successor to  [Plutoberth's original SonyHeadphonesClient](https://github.com/Plutoberth/SonyHeadphonesClient) - now with standardized support for newer devices and more platforms.
 
+There's no release build yet - but you can always grab the latest [nightly builds](https://nightly.link/mos9527/SonyHeadphonesClient/workflows/cmake/rewrite?preview), or use the [Web Version](#notes-on-web-platform).
+
+[![Build](https://github.com/mos9527/sonyheadphonesclient/actions/workflows/cmake.yml/badge.svg)](https://github.com/mos9527/SonyHeadphonesClient/actions/workflows/cmake.yml) 
+[![Nightly Builds](https://img.shields.io/badge/rewrite-builds-cyan)](https://nightly.link/mos9527/SonyHeadphonesClient/workflows/cmake/rewrite?preview)
+
+## Roadmap
+This brach is expected to be merged once the following features have been implemented.
+- [ ] Support for legacy (`v1` protocol) devices, e.g. WH-1000XM4, WH-1000XM3
+- [ ] Native macOS platform support
+
 ## Compatiblity
 
 The following platforms (applies to `libmdr`, `client`) are *natively* supported with first-party effort.
@@ -29,6 +39,8 @@ As always, status reports are welcome - please do submit an Issue if your browse
 
 We have extensive documentations available in the source files. Moreover, refer to the respective README files in each source folder to understand what they do!
 
+A C++20 compliant compiler is required. GCC 14, Clang 21 and MSVC 19 has been used for development and are guanrateed to be supported.
+
 ### Building (Regular CMake)
 This is no different from your regular CMake projects.
 Dependencies are managed by CMake's `FetchContent` and are always statically linked, so no worries - Expect things to *just work*.
diff --git a/libmdr/src/Platform/Linux/CMakeLists.txt b/libmdr/src/Platform/Linux/CMakeLists.txt
@@ -12,7 +12,7 @@ file(
 add_library(mdr_PlatformLinux ${SOURCES} ${INCLUDES})
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
 find_package(DBus REQUIRED)
-message(STATUS "Found DBus: ${DBus_INCLUDE_DIRS}")
+message(STATUS "Found DBus: ${DBus_INCLUDE_DIRS} ${DBus_LIBRARIES}")
 
-target_link_libraries(mdr_PlatformLinux PRIVATE mdr-c fmt::fmt ${DBUS_LIBRARIES} bluetooth)
+target_link_libraries(mdr_PlatformLinux PRIVATE mdr-c fmt::fmt ${DBus_LIBRARIES} bluetooth)
 target_include_directories(mdr_PlatformLinux PRIVATE ${DBus_INCLUDE_DIRS})
