From e7154f17853ef639c589f4a0fcf5f4ef9637554c Mon Sep 17 00:00:00 2001 From: Croydon Date: Mon, 31 Jan 2022 13:49:06 +0100 Subject: [PATCH] CI: Combine Workflows --- .github/workflows/autotools.yml | 24 ------------------------ .github/workflows/{cmake.yml => ci.yml} | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 24 deletions(-) delete mode 100644 .github/workflows/autotools.yml rename .github/workflows/{cmake.yml => ci.yml} (52%) diff --git a/.github/workflows/autotools.yml b/.github/workflows/autotools.yml deleted file mode 100644 index 736fe66f..00000000 --- a/.github/workflows/autotools.yml +++ /dev/null @@ -1,24 +0,0 @@ -on: [push, pull_request] - -name: Autotools - -jobs: - autotools-build: - name: Autotools ${{ matrix.os }} ${{ matrix.build_type }} - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: ["ubuntu-latest"] - build_type: ["", " install-strip"] - steps: - - uses: actions/checkout@v2 - - - name: Autoreconf - run: | - autoreconf --install "${{github.workspace}}" - - name: Make - run: | - ./configure --prefix=${{github.workspace}}/build - make${{ matrix.build_type }} - make install diff --git a/.github/workflows/cmake.yml b/.github/workflows/ci.yml similarity index 52% rename from .github/workflows/cmake.yml rename to .github/workflows/ci.yml index e4456cdf..340c8502 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/ci.yml @@ -19,3 +19,23 @@ jobs: - name: Build run: cmake --build ${{github.workspace}}/build --config ${{ matrix.build_type }} + + autotools-build: + name: Autotools ${{ matrix.os }} ${{ matrix.build_type }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: ["ubuntu-latest"] + build_type: ["", " install-strip"] + steps: + - uses: actions/checkout@v2 + + - name: Autoreconf + run: | + autoreconf --install "${{github.workspace}}" + - name: Make + run: | + ./configure --prefix=${{github.workspace}}/build + make${{ matrix.build_type }} + make install