Skip to content

Commit d4f7920

Browse files
UnGastctreffs
andauthored
fix linux CI (#3)
* Update ci-linux.yml * Update CI Co-authored-by: Christian Treffs <ctreffs@gmail.com>
1 parent 69a2a11 commit d4f7920

File tree

3 files changed

+5
-20
lines changed

3 files changed

+5
-20
lines changed

.github/workflows/ci-linux.yml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches: [ main ]
66
pull_request:
7-
types: [labeled]
7+
branches: [ main ]
88
workflow_dispatch:
99

1010
jobs:
@@ -15,7 +15,6 @@ jobs:
1515
swift: ["latest"]
1616
container:
1717
image: swift:${{ matrix.swift }}
18-
if: contains( github.event.pull_request.labels.*.name, 'ci-linux') || contains( github.event.pull_request.labels.*.name, 'ci-all')
1918
steps:
2019
- name: Checkout
2120
uses: actions/checkout@v2.3.4
@@ -47,18 +46,6 @@ jobs:
4746
apt-get install -y libvulkan1
4847
apt-get install -y vulkan-utils
4948
50-
- name: Test
51-
run: make test
52-
53-
- name: Upload test artifacts
54-
if: failure()
55-
uses: actions/upload-artifact@v2.2.4
56-
with:
57-
name: test-artifacts-${{ matrix.xcode }}-${{ github.run_id }}
58-
path: |
59-
.build/**/*.json
60-
.build/**/*.xctest
61-
6249
- name: Build Release
6350
run: make build-release
6451

.github/workflows/ci-macos.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: macOS
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ main ]
66
pull_request:
7-
types: [labeled]
7+
branches: [ main ]
88
workflow_dispatch:
99

1010
jobs:
@@ -13,7 +13,6 @@ jobs:
1313
strategy:
1414
matrix:
1515
xcode: ["13.0"]
16-
if: contains( github.event.pull_request.labels.*.name, 'ci-macOS') || contains( github.event.pull_request.labels.*.name, 'ci-all')
1716
steps:
1817
- name: Checkout
1918
uses: actions/checkout@v2.3.4

.github/workflows/markdown-link-check.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@ name: Check markdown links
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ main ]
66
pull_request:
7-
types: [labeled]
7+
branches: [ main ]
88
workflow_dispatch:
99

1010
jobs:
1111
markdown-link-check:
1212
runs-on: ubuntu-latest
13-
if: contains( github.event.pull_request.labels.*.name, 'ci-all')
1413
steps:
1514
- name: Checkout
1615
uses: actions/checkout@v2.3.4

0 commit comments

Comments
 (0)