Merge pull request #236 from anholt/ebassi/ci-split

ci: Split Linux and macOS pipelines

3 files changed, 34 insertions, 15 deletions

diff --git a/.github/workflows/ci.yml b/.github/workflows/linux.yml
index 4086757..3d71e7f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/linux.yml
@@ -1,4 +1,4 @@
-name: Build
+name: Ubuntu
 on:
   push:
     branches-ignore:
@@ -10,7 +10,6 @@ jobs:
       matrix:
         os: 
           - ubuntu-18.04
-          - macos-10.15
         compiler:
           - gcc
           - clang
@@ -19,16 +18,10 @@ jobs:
           - '-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: >
+      - run: >
           sudo apt-get update &&
           sudo apt-get install --no-install-recommends
           libgl1-mesa-dev
@@ -42,7 +35,4 @@ jobs:
       - 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 }}"
+          /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 }}"
diff --git a/README.md b/README.md
index 56b6a65..9d83ed9 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,8 @@
-[![Build Status](https://travis-ci.org/anholt/libepoxy.svg?branch=master)](https://travis-ci.org/anholt/libepoxy)
-[![Build status](https://ci.appveyor.com/api/projects/status/xv6y5jurt5v5ngjx/branch/master?svg=true)](https://ci.appveyor.com/project/ebassi/libepoxy/branch/master)
+![Ubuntu](https://github.com/anholt/libepoxy/workflows/Ubuntu/badge.svg)
+![macOS](https://github.com/anholt/libepoxy/workflows/macOS/badge.svg)
+![MSVC Build](https://github.com/anholt/libepoxy/workflows/MSVC%20Build/badge.svg)
+![MSYS2 Build](https://github.com/anholt/libepoxy/workflows/MSYS2%20Build/badge.svg)
+[![License: MIT](https://img.shields.io/badge/license-MIT-brightgreen.svg)](https://opensource.org/licenses/MIT)
 
 Epoxy is a library for handling OpenGL function pointer management for
 you.