From 642330e86fa6c763d92e4118749df2ddb61cd5cc Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 23 Dec 2020 19:42:27 +0000 Subject: ci: Split Linux and macOS pipelines Don't use a single pipeline for everything. --- .github/workflows/ci.yml | 48 --------------------------------------------- .github/workflows/linux.yml | 38 +++++++++++++++++++++++++++++++++++ .github/workflows/macos.yml | 26 ++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 48 deletions(-) delete mode 100644 .github/workflows/ci.yml create mode 100644 .github/workflows/linux.yml create mode 100644 .github/workflows/macos.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index 4086757..0000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,48 +0,0 @@ -name: Build -on: - push: - branches-ignore: - - debian - - khronos-registry -jobs: - build: - strategy: - matrix: - os: - - ubuntu-18.04 - - macos-10.15 - compiler: - - gcc - - clang - build-opts: - - '' - - '-Dglx=no' - - '-Degl=no' - - '-Dx11=false' - exclude: - - os: macos-10.15 - compiler: gcc - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v2 - - if: runner.os == 'macOS' - run: brew install ninja - - if: runner.os == 'Linux' - run: > - sudo apt-get update && - sudo apt-get install --no-install-recommends - libgl1-mesa-dev - libegl1-mesa-dev - libgles2-mesa-dev - libgl1-mesa-dri - ninja-build - - uses: actions/setup-python@v2 - with: - python-version: 3.x - - run: | - python -m pip install --upgrade pip - pip3 install meson - - if: runner.os == 'macOS' - run: /bin/sh -c "CC=${{ matrix.compiler }} .github/scripts/epoxy-ci-osx.sh ${{ matrix.build-opts }}" - - if: runner.os == 'Linux' - run: /bin/sh -c "CC=${{ matrix.compiler }} .github/scripts/epoxy-ci-linux.sh ${{ matrix.build-opts }}" diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml new file mode 100644 index 0000000..3d71e7f --- /dev/null +++ b/.github/workflows/linux.yml @@ -0,0 +1,38 @@ +name: Ubuntu +on: + push: + branches-ignore: + - debian + - khronos-registry +jobs: + build: + strategy: + matrix: + os: + - ubuntu-18.04 + compiler: + - gcc + - clang + build-opts: + - '' + - '-Dglx=no' + - '-Degl=no' + - '-Dx11=false' + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v2 + - run: > + sudo apt-get update && + sudo apt-get install --no-install-recommends + libgl1-mesa-dev + libegl1-mesa-dev + libgles2-mesa-dev + libgl1-mesa-dri + ninja-build + - uses: actions/setup-python@v2 + with: + python-version: 3.x + - run: | + python -m pip install --upgrade pip + pip3 install meson + /bin/sh -c "CC=${{ matrix.compiler }} .github/scripts/epoxy-ci-linux.sh ${{ matrix.build-opts }}" diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml new file mode 100644 index 0000000..c725ef1 --- /dev/null +++ b/.github/workflows/macos.yml @@ -0,0 +1,26 @@ +name: macOS +on: + push: + branches-ignore: + - debian + - khronos-registry +jobs: + build: + strategy: + matrix: + build-opts: + - '' + - '-Dglx=no' + - '-Degl=no' + - '-Dx11=false' + runs-on: macos-10.15 + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: 3.x + - run: | + brew install ninja + python -m pip install --upgrade pip + pip3 install meson + /bin/sh -c "CC=clang .github/scripts/epoxy-ci-osx.sh ${{ matrix.build-opts }}" -- cgit v1.2.3