ci: Split Linux and macOS pipelines

Don't use a single pipeline for everything.
macos/v1.5.9
Emmanuele Bassi 4 years ago
parent 03b9b4692c
commit 642330e86f
  1. 16
      .github/workflows/linux.yml
  2. 26
      .github/workflows/macos.yml

@ -1,4 +1,4 @@
name: Build name: Ubuntu
on: on:
push: push:
branches-ignore: branches-ignore:
@ -10,7 +10,6 @@ jobs:
matrix: matrix:
os: os:
- ubuntu-18.04 - ubuntu-18.04
- macos-10.15
compiler: compiler:
- gcc - gcc
- clang - clang
@ -19,16 +18,10 @@ jobs:
- '-Dglx=no' - '-Dglx=no'
- '-Degl=no' - '-Degl=no'
- '-Dx11=false' - '-Dx11=false'
exclude:
- os: macos-10.15
compiler: gcc
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- if: runner.os == 'macOS' - run: >
run: brew install ninja
- if: runner.os == 'Linux'
run: >
sudo apt-get update && sudo apt-get update &&
sudo apt-get install --no-install-recommends sudo apt-get install --no-install-recommends
libgl1-mesa-dev libgl1-mesa-dev
@ -42,7 +35,4 @@ jobs:
- run: | - run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip3 install meson pip3 install meson
- if: runner.os == 'macOS' /bin/sh -c "CC=${{ matrix.compiler }} .github/scripts/epoxy-ci-linux.sh ${{ matrix.build-opts }}"
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 }}"

@ -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 }}"
Loading…
Cancel
Save