From: Steve Lhomme Date: Sat, 15 Oct 2022 14:17:09 +0000 (+0200) Subject: CI: don't build C++ with any compiler extension X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=10d9463153c57e88e5b632bdd4de13d30ae83ad5;p=libmatroska CI: don't build C++ with any compiler extension Use -std=c++14 instead of -std=gnu++14 so we can tell when using improper C++. --- diff --git a/.github/workflows/linux-gcc10.yaml b/.github/workflows/linux-gcc10.yaml index d7b7ebe..f1fc456 100644 --- a/.github/workflows/linux-gcc10.yaml +++ b/.github/workflows/linux-gcc10.yaml @@ -9,6 +9,9 @@ jobs: build_libmatroska: name: libmatroska with gcc10 runs-on: ubuntu-latest + env: + CMAKE_OPTIONS: -DCMAKE_CXX_EXTENSIONS=OFF + CMAKE_MATROSKA_OPTIONS: ${{ env.CMAKE_OPTIONS }} -DBUILD_EXAMPLES=ON steps: - uses: lukka/get-cmake@latest @@ -23,7 +26,7 @@ jobs: # minimum version we support ref: 'release-1.4.3' - name: Configure libebml - run: cmake -S libebml -B libebml/_build + run: cmake -S libebml -B libebml/_build ${{ env.CMAKE_OPTIONS }} env: CC: gcc-10 CXX: g++-10 @@ -35,12 +38,12 @@ jobs: run: cmake --install libebml/_build --prefix ${GITHUB_WORKSPACE}/_built - name: Configure CMake - run: cmake -S . -B _build -DBUILD_EXAMPLES=ON -DEBML_DIR="${GITHUB_WORKSPACE}/_built/lib/cmake/EBML" + run: cmake -S . -B _build ${{ env.CMAKE_MATROSKA_OPTIONS }} -DEBML_DIR="${GITHUB_WORKSPACE}/_built/lib/cmake/EBML" env: CC: gcc-10 CXX: g++-10 - - name: Build with CMake + - name: Build run: cmake --build _build --parallel - name: Test installation diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml index 199c9f6..7545901 100644 --- a/.github/workflows/linux.yaml +++ b/.github/workflows/linux.yaml @@ -9,6 +9,9 @@ jobs: build_libmatroska: name: libmatroska runs-on: ubuntu-latest + env: + CMAKE_OPTIONS: -DCMAKE_CXX_EXTENSIONS=OFF + CMAKE_MATROSKA_OPTIONS: ${{ env.CMAKE_OPTIONS }} -DBUILD_EXAMPLES=ON steps: - uses: lukka/get-cmake@latest @@ -23,7 +26,7 @@ jobs: # minimum version we support ref: 'release-1.4.3' - name: Configure libebml - run: cmake -S libebml -B libebml/_build + run: cmake -S libebml -B libebml/_build ${{ env.CMAKE_OPTIONS }} - name: Build libebml run: cmake --build libebml/_build --parallel @@ -32,9 +35,9 @@ jobs: run: cmake --install libebml/_build --prefix ${GITHUB_WORKSPACE}/_built - name: Configure CMake - run: cmake -S . -B _build -DBUILD_EXAMPLES=ON -DEBML_DIR="${GITHUB_WORKSPACE}/_built/lib/cmake/EBML" + run: cmake -S . -B _build ${{ env.CMAKE_MATROSKA_OPTIONS }} -DEBML_DIR="${GITHUB_WORKSPACE}/_built/lib/cmake/EBML" - - name: Build with CMake + - name: Build run: cmake --build _build --parallel - name: Test installation diff --git a/.github/workflows/macos.yaml b/.github/workflows/macos.yaml index 3f6e830..307b8f8 100644 --- a/.github/workflows/macos.yaml +++ b/.github/workflows/macos.yaml @@ -9,6 +9,9 @@ jobs: build_libmatroska: name: libmatroska runs-on: macos-latest + env: + CMAKE_OPTIONS: -DCMAKE_CXX_EXTENSIONS=OFF + CMAKE_MATROSKA_OPTIONS: ${{ env.CMAKE_OPTIONS }} -DBUILD_EXAMPLES=ON steps: - uses: lukka/get-cmake@latest @@ -23,7 +26,7 @@ jobs: # minimum version we support ref: 'release-1.4.3' - name: Configure libebml - run: cmake -S libebml -B libebml/_build + run: cmake -S libebml -B libebml/_build ${{ env.CMAKE_OPTIONS }} - name: Build libebml run: cmake --build libebml/_build --parallel @@ -32,7 +35,7 @@ jobs: run: cmake --install libebml/_build --prefix ${GITHUB_WORKSPACE}/_built - name: Configure CMake - run: cmake -S . -B _build -DBUILD_EXAMPLES=ON -DEBML_DIR="${GITHUB_WORKSPACE}/_built/lib/cmake/EBML" + run: cmake -S . -B _build ${{ env.CMAKE_MATROSKA_OPTIONS }} -DEBML_DIR="${GITHUB_WORKSPACE}/_built/lib/cmake/EBML" - name: Build with CMake run: cmake --build _build --parallel diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index a254f89..52ebd86 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -17,6 +17,9 @@ jobs: { "name": "Dynamic", "option": "ON"}, { "name": "Static", "option": "OFF"} ] + env: + CMAKE_OPTIONS: -DCMAKE_CXX_EXTENSIONS=OFF + CMAKE_MATROSKA_OPTIONS: ${{ env.CMAKE_OPTIONS }} -DBUILD_EXAMPLES=ON steps: - uses: lukka/get-cmake@latest @@ -31,7 +34,7 @@ jobs: # minimum version we support ref: 'release-1.4.3' - name: Configure ${{ matrix.shared.name }} libebml - run: cmake -S libebml -B libebml/_build -DBUILD_SHARED_LIBS=${{ matrix.shared.option }} + run: cmake -S libebml -B libebml/_build ${{ env.CMAKE_OPTIONS }} -DBUILD_SHARED_LIBS=${{ matrix.shared.option }} - name: Build libebml run: cmake --build libebml/_build --config ${{ matrix.config }} --parallel @@ -40,7 +43,7 @@ jobs: run: cmake --install libebml/_build --config ${{ matrix.config }} --prefix ${GITHUB_WORKSPACE}/_built - name: Configure ${{ matrix.shared.name }} library - run: cmake -S . -B _build -DEBML_DIR="${GITHUB_WORKSPACE}/_built/lib/cmake/EBML" -DBUILD_EXAMPLES=ON -DBUILD_SHARED_LIBS=${{ matrix.shared.option }} + run: cmake -S . -B _build ${{ env.CMAKE_MATROSKA_OPTIONS }} -DEBML_DIR="${GITHUB_WORKSPACE}/_built/lib/cmake/EBML" -DBUILD_SHARED_LIBS=${{ matrix.shared.option }} - name: Build run: cmake --build _build --config ${{ matrix.config }} --parallel