From 3a31859efeb054cdcd407fe152802ddc5c58bbce Mon Sep 17 00:00:00 2001 From: Gwynne Raskind Date: Tue, 21 Mar 2023 17:18:42 -0500 Subject: [PATCH] Add platform specifiers (#89) * Add platform specifiers * De-ancientize CI --- .github/workflows/test.yml | 48 ++++++-------------------------------- Package.swift | 6 +++++ 2 files changed, 13 insertions(+), 41 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e8584240..e85be006 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,44 +1,10 @@ name: test -on: { pull_request: {} } +on: + pull_request: { branches: ['*'] } + push: { branches: ['main'] } jobs: - getcidata: - runs-on: ubuntu-latest - outputs: - environments: ${{ steps.output.outputs.environments }} - steps: - - id: output - run: | - envblob="$(curl -fsSL https://raw.githubusercontent.com/vapor/ci/main/pr-environments.json | jq -cMj '.')" - echo "::set-output name=environments::${envblob}" - - test-vapor: - needs: getcidata - strategy: - fail-fast: false - matrix: - env: ${{ fromJSON(needs.getcidata.outputs.environments) }} - runs-on: ${{ matrix.env.os }} - container: ${{ matrix.env.image }} - steps: - - name: Select toolchain - uses: maxim-lobanov/setup-xcode@v1.2.1 - with: - xcode-version: ${{ matrix.env.toolchain }} - if: ${{ matrix.env.toolchain != '' }} - - name: Check out Vapor - uses: actions/checkout@v3 - - name: Run tests with Thread Sanitizer - timeout-minutes: 20 - run: swift test --enable-test-discovery --sanitize=thread - - test-exports: - name: Test exports - runs-on: ubuntu-latest - steps: - - name: Check out source - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Build - run: swift build -Xswiftc -DBUILDING_DOCC \ No newline at end of file + unit-tests: + uses: vapor/ci/.github/workflows/run-unit-tests.yml@reusable-workflows + with: + with_coverage: false diff --git a/Package.swift b/Package.swift index bdc23ee8..cbc6ccc5 100644 --- a/Package.swift +++ b/Package.swift @@ -3,6 +3,12 @@ import PackageDescription let package = Package( name: "multipart-kit", + platforms: [ + .macOS(.v10_15), + .iOS(.v13), + .tvOS(.v13), + .watchOS(.v6), + ], products: [ .library(name: "MultipartKit", targets: ["MultipartKit"]), ],