Skip to content

Commit 3a31859

Browse files
authored
Add platform specifiers (vapor#89)
* Add platform specifiers * De-ancientize CI
1 parent cd27a6e commit 3a31859

File tree

2 files changed

+13
-41
lines changed

2 files changed

+13
-41
lines changed

.github/workflows/test.yml

Lines changed: 7 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,10 @@
11
name: test
2-
on: { pull_request: {} }
2+
on:
3+
pull_request: { branches: ['*'] }
4+
push: { branches: ['main'] }
35

46
jobs:
5-
getcidata:
6-
runs-on: ubuntu-latest
7-
outputs:
8-
environments: ${{ steps.output.outputs.environments }}
9-
steps:
10-
- id: output
11-
run: |
12-
envblob="$(curl -fsSL https://raw.githubusercontent.com/vapor/ci/main/pr-environments.json | jq -cMj '.')"
13-
echo "::set-output name=environments::${envblob}"
14-
15-
test-vapor:
16-
needs: getcidata
17-
strategy:
18-
fail-fast: false
19-
matrix:
20-
env: ${{ fromJSON(needs.getcidata.outputs.environments) }}
21-
runs-on: ${{ matrix.env.os }}
22-
container: ${{ matrix.env.image }}
23-
steps:
24-
- name: Select toolchain
25-
uses: maxim-lobanov/[email protected]
26-
with:
27-
xcode-version: ${{ matrix.env.toolchain }}
28-
if: ${{ matrix.env.toolchain != '' }}
29-
- name: Check out Vapor
30-
uses: actions/checkout@v3
31-
- name: Run tests with Thread Sanitizer
32-
timeout-minutes: 20
33-
run: swift test --enable-test-discovery --sanitize=thread
34-
35-
test-exports:
36-
name: Test exports
37-
runs-on: ubuntu-latest
38-
steps:
39-
- name: Check out source
40-
uses: actions/checkout@v3
41-
with:
42-
fetch-depth: 0
43-
- name: Build
44-
run: swift build -Xswiftc -DBUILDING_DOCC
7+
unit-tests:
8+
uses: vapor/ci/.github/workflows/run-unit-tests.yml@reusable-workflows
9+
with:
10+
with_coverage: false

Package.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ import PackageDescription
33

44
let package = Package(
55
name: "multipart-kit",
6+
platforms: [
7+
.macOS(.v10_15),
8+
.iOS(.v13),
9+
.tvOS(.v13),
10+
.watchOS(.v6),
11+
],
612
products: [
713
.library(name: "MultipartKit", targets: ["MultipartKit"]),
814
],

0 commit comments

Comments
 (0)