Skip to content

Commit

Permalink
fix linux CI (#3)
Browse files Browse the repository at this point in the history
* Update ci-linux.yml

* Update CI

Co-authored-by: Christian Treffs <[email protected]>
  • Loading branch information
UnGast and ctreffs authored Nov 12, 2021
1 parent 69a2a11 commit d4f7920
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 20 deletions.
15 changes: 1 addition & 14 deletions .github/workflows/ci-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [ main ]
pull_request:
types: [labeled]
branches: [ main ]
workflow_dispatch:

jobs:
Expand All @@ -15,7 +15,6 @@ jobs:
swift: ["latest"]
container:
image: swift:${{ matrix.swift }}
if: contains( github.event.pull_request.labels.*.name, 'ci-linux') || contains( github.event.pull_request.labels.*.name, 'ci-all')
steps:
- name: Checkout
uses: actions/[email protected]
Expand Down Expand Up @@ -47,18 +46,6 @@ jobs:
apt-get install -y libvulkan1
apt-get install -y vulkan-utils
- name: Test
run: make test

- name: Upload test artifacts
if: failure()
uses: actions/[email protected]
with:
name: test-artifacts-${{ matrix.xcode }}-${{ github.run_id }}
path: |
.build/**/*.json
.build/**/*.xctest
- name: Build Release
run: make build-release

Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/ci-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: macOS

on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
types: [labeled]
branches: [ main ]
workflow_dispatch:

jobs:
Expand All @@ -13,7 +13,6 @@ jobs:
strategy:
matrix:
xcode: ["13.0"]
if: contains( github.event.pull_request.labels.*.name, 'ci-macOS') || contains( github.event.pull_request.labels.*.name, 'ci-all')
steps:
- name: Checkout
uses: actions/[email protected]
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/markdown-link-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@ name: Check markdown links

on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
types: [labeled]
branches: [ main ]
workflow_dispatch:

jobs:
markdown-link-check:
runs-on: ubuntu-latest
if: contains( github.event.pull_request.labels.*.name, 'ci-all')
steps:
- name: Checkout
uses: actions/[email protected]
Expand Down

0 comments on commit d4f7920

Please sign in to comment.