Skip to content

Commit

Permalink
Merge branch 'master' into development/METROL-973
Browse files Browse the repository at this point in the history
  • Loading branch information
VeithMetro authored Oct 18, 2024
2 parents e5d91e7 + 9bb995b commit 76a862c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/Linux build template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
jobs:
ThunderInterfaces:

runs-on: ubuntu-latest
runs-on: ubuntu-24.04

strategy:
matrix:
Expand All @@ -28,8 +28,10 @@ jobs:
echo "deb http://archive.ubuntu.com/ubuntu/ jammy-updates main universe restricted multiverse" | sudo tee -a /etc/apt/sources.list
sudo dpkg --add-architecture i386
sudo apt-get update
sudo apt install python3-pip build-essential cmake ninja-build libusb-1.0-0-dev zlib1g-dev zlib1g-dev:i386 libssl-dev gcc-11-multilib g++-11-multilib
sudo pip install jsonref
sudo apt install python3-pip build-essential cmake ninja-build libusb-1.0-0-dev ${{matrix.architecture == '32' && 'zlib1g-dev:i386 libssl-dev:i386 gcc-13-multilib g++-13-multilib' || 'zlib1g-dev libssl-dev'}}
python3 -m venv venv
source venv/bin/activate
pip install jsonref
- name: Download artifacts
uses: actions/download-artifact@v4
Expand Down Expand Up @@ -70,6 +72,7 @@ jobs:
# ----- Building & uploading -----
- name: Build ThunderInterfaces
run: |
source venv/bin/activate
cmake -G Ninja -S ThunderInterfaces -B ${{matrix.build_type}}/build/ThunderInterfaces \
-DCMAKE_CXX_FLAGS="-Wall -Wextra -Wpedantic -Werror -m${{matrix.architecture}}" \
-DCMAKE_C_FLAGS="-Wall -Wextra -Wpedantic -Werror -m${{matrix.architecture}}" \
Expand Down
2 changes: 1 addition & 1 deletion interfaces/IDolby.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ namespace Exchange {
PASSTHRU,
DOLBYDIGITAL,
DOLBYDIGITALPLUS,
SOUNDMODE_AUTO /* @text:Auto */
SOUNDMODE_AUTO
};

// @event @uncompliant:extended
Expand Down

0 comments on commit 76a862c

Please sign in to comment.