Skip to content

Commit

Permalink
Update minimum Swift version to 5.5 (#751)
Browse files Browse the repository at this point in the history
Update minimum Swift version to 5.5, update very ancient CI
  • Loading branch information
gwynne authored Nov 27, 2022
1 parent 26c4460 commit 2da106f
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 32 deletions.
39 changes: 9 additions & 30 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,12 @@
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-fluent:
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/[email protected]
with:
xcode-version: ${{ matrix.env.toolchain }}
if: ${{ matrix.env.toolchain != '' }}
- name: Check out Vapor
uses: actions/checkout@v2
- name: Run tests with Thread Sanitizer
timeout-minutes: 30
run: swift test --enable-test-discovery --sanitize=thread
unit-tests:
uses: vapor/ci/.github/workflows/run-unit-tests.yml@reusable-workflows
with:
with_coverage: true
with_tsan: true
with_public_api_check: ${{ github.event_name == 'pull_request' }}
4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.2
// swift-tools-version:5.5
import PackageDescription

let package = Package(
Expand All @@ -10,7 +10,7 @@ let package = Package(
.library(name: "Fluent", targets: ["Fluent"]),
],
dependencies: [
.package(url: "https://github.com/vapor/fluent-kit.git", from: "1.16.0"),
.package(url: "https://github.com/vapor/fluent-kit.git", from: "1.36.0"),
.package(url: "https://github.com/vapor/vapor.git", from: "4.50.0"),
],
targets: [
Expand Down

0 comments on commit 2da106f

Please sign in to comment.