diff options
| author | Martijn van Beurden <mvanb1@gmail.com> | 2022-04-27 19:53:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-27 19:53:13 +0200 |
| commit | 0caf685360f1c06173f5bfd084b8679d517389f9 (patch) | |
| tree | f989191aa495168398c98c7d4abb28d9c146fd21 /.github/workflows | |
| parent | 1793632ee6988deb933ff7551fee92134622b558 (diff) | |
| download | flac-0caf685360f1c06173f5bfd084b8679d517389f9.tar.gz | |
[CMake] Enable building ogg together with flac (#325)
This reverts the part of commit 2013738 that searched for a local
ogg build
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/action.yml | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml index 9b79ecf1..a6dd600b 100644 --- a/.github/workflows/action.yml +++ b/.github/workflows/action.yml @@ -72,7 +72,7 @@ jobs: - name: windows-latest-cmake os: windows-latest build-system: cmake - configure-opts: '-DWITH_OGG=OFF' + configure-opts: '' - name: ubuntu-latest-gcc-autotools-64-bit-words os: ubuntu-latest @@ -121,8 +121,14 @@ jobs: steps: - uses: actions/checkout@v2 + - uses: actions/checkout@v2 + if: startsWith(matrix.build-system,'cmake') + with: + repository: xiph/ogg + path: ./ogg + - name: Install MacOS dependencies - if: startsWith(matrix.os,'macos') + if: startsWith(matrix.os,'macos') && !startsWith(matrix.build-system,'cmake') run: | brew update brew install automake pkg-config libogg |