diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2020-12-23 19:42:27 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2020-12-23 19:43:58 +0000 |
| commit | 642330e86fa6c763d92e4118749df2ddb61cd5cc (patch) | |
| tree | 3964721811ff82e078d4bcfb8583a55bc2d925b4 | |
| parent | 03b9b4692cfdd14f96d9e811bb5c89f3a0696bf5 (diff) | |
| download | libepoxy-642330e86fa6c763d92e4118749df2ddb61cd5cc.tar.gz | |
ci: Split Linux and macOS pipelines
Don't use a single pipeline for everything.
| -rw-r--r-- | .github/workflows/linux.yml (renamed from .github/workflows/ci.yml) | 16 | ||||
| -rw-r--r-- | .github/workflows/macos.yml | 26 |
2 files changed, 29 insertions, 13 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 }}" |