diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f4c7cfe2..0554cc04 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,8 +22,9 @@ jobs: matrix: config: - name: Linux GCC - os: ubuntu-latest + os: ubuntu-24.04 compiler: gcc + extra-options: -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=OFF shell: bash - name: macOS Clang @@ -51,11 +52,6 @@ jobs: libsndfile1-dev \ libfluidsynth-dev \ libxmp-dev - sudo sed -e 's/jammy/lunar/g;s/22/23/g' -i /etc/apt/sources.list /etc/apt/sources.list.d/* - sudo apt-get update - sudo apt-get install \ - libflac-dev \ - libsndfile1-dev - name: Install dependencies (macOS) if: runner.os == 'macOS' @@ -95,8 +91,8 @@ jobs: CC: ${{ matrix.config.compiler }} run: | cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DENABLE_WERROR=ON -DENABLE_HARDENING=ON -DENABLE_LTO=ON + -DENABLE_WERROR=ON -DENABLE_HARDENING=ON -DENABLE_LTO=ON \ + ${{ matrix.config.extra-options }} - name: Build run: cmake --build build