Skip to content

Commit c18d19a

Browse files
authored
Rewrite some really truly amazingly darn outdated CI (#115)
1 parent e879e41 commit c18d19a

File tree

2 files changed

+41
-20
lines changed

2 files changed

+41
-20
lines changed

.github/workflows/main-codecov.yml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
name: Update code coverage baselines
2+
on:
3+
push: { branches: [ main ] }
4+
jobs:
5+
update-main-codecov:
6+
uses: vapor/ci/.github/workflows/run-unit-tests.yml@reusable-workflows
7+
with:
8+
with_coverage: true
9+
with_tsan: true

.github/workflows/test.yml

+32-20
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,40 @@ name: test
22
on:
33
- pull_request
44
jobs:
5-
websocket-kit_xenial:
6-
container:
7-
image: vapor/swift:5.2-xenial
5+
vapor-integration:
86
runs-on: ubuntu-latest
9-
steps:
10-
- uses: actions/checkout@v1
11-
- run: swift test --enable-test-discovery --sanitize=thread
12-
websocket-kit_bionic:
137
container:
14-
image: vapor/swift:5.2-bionic
15-
runs-on: ubuntu-latest
8+
image: swift:5.6-focal
169
steps:
17-
- uses: actions/checkout@v1
18-
- run: swift test --enable-test-discovery --sanitize=thread
19-
vapor:
20-
container:
21-
image: vapor/swift:5.2
10+
- name: Check out package
11+
uses: actions/checkout@v3
12+
with: { path: 'websocket-kit' }
13+
- name: Check out Vapor
14+
uses: actions/checkout@v3
15+
with: { repository: 'vapor/vapor', path: 'vapor' }
16+
- name: Use local package in Vapor
17+
run: |
18+
swift package --package-path vapor edit websocket-kit --path websocket-kit
19+
- name: Run Vapor tests
20+
run: swift test --package-path vapor
21+
22+
unit-tests:
23+
uses: vapor/ci/.github/workflows/run-unit-tests.yml@reusable-workflows
24+
with:
25+
with_coverage: true
26+
with_tsan: false
27+
coverage_ignores: '/Tests/'
28+
29+
api-breakage:
2230
runs-on: ubuntu-latest
31+
container:
32+
image: swift:5.6-focal
2333
steps:
24-
- run: git clone -b main https://github.com/vapor/vapor.git
25-
working-directory: ./
26-
- run: swift package edit websocket-kit --revision ${{ github.sha }}
27-
working-directory: ./vapor
28-
- run: swift test --enable-test-discovery --sanitize=thread
29-
working-directory: ./vapor
34+
- name: Checkout
35+
uses: actions/checkout@v3
36+
with:
37+
fetch-depth: 0
38+
- name: Mark the workspace as safe
39+
run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
40+
- name: API breaking changes
41+
run: swift package diagnose-api-breaking-changes origin/main

0 commit comments

Comments
 (0)