Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 0 additions & 82 deletions .circleci/config.yml

This file was deleted.

32 changes: 32 additions & 0 deletions .github/workflows/danger.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Danger
on:
pull_request:
branches:
- stable

jobs:
Danger:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- name: Cache Bundle Dependencies
uses: actions/cache@v1
with:
path: vendor/bundle
key: 1-gems-{{ checksum "Gemfile.lock" }}
restore-keys: 1-gems-
- name: Set Ruby Version
uses: actions/setup-ruby@v1
with:
ruby-version: 2.6
- name: Install Ruby Dependencies
run: |
bundle config path vendor/bundle
bundle check || bundle install
env:
BUNDLE_JOBS: 4
BUNDLE_RETRY: 3
- name: Running Danger
run: bundle exec danger
env:
DANGER_GITHUB_API_TOKEN: ${{ secrets.DANGER_GITHUB_API_TOKEN }}
16 changes: 16 additions & 0 deletions .github/workflows/linux-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Test Linux Platform
on:
pull_request:
branches:
- stable

jobs:
Test-Linux-Platform:
runs-on: ubuntu-latest
container:
image: swift:5.2
options: --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --security-opt apparmor=unconfined
steps:
- uses: actions/checkout@v2
- name: Run Unit Tests
run: swift test
39 changes: 39 additions & 0 deletions .github/workflows/macos-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Test OS X Platform
on:
pull_request:
branches:
- stable

jobs:
Test-OS-X-Platform:
runs-on: macos-latest
env:
TEST_REPORTS: /tmp/test-results
LANG: en_US.UTF-8

steps:
- uses: actions/checkout@v2
- name: Create Test Result Directory
run: |
mkdir -p tmp/test-results/
- name: Run Unit Test - macOS
run: |
cd XCode
set -o pipefail && xcodebuild test -scheme SwifterMac -sdk macosx -destination "arch=x86_64" | xcpretty -c -r html --output $TEST_REPORTS/macOS.html
- name: Run Unit Test - iOS
run: |
cd XCode
set -o pipefail && xcodebuild test -scheme SwifteriOS -sdk iphonesimulator -destination "name=iPhone 8" | xcpretty -c -r html --output $TEST_REPORTS/iOS.html
- name: Run Unit Test - tvOS
run: |
cd XCode
set -o pipefail && xcodebuild test -scheme SwiftertvOS -sdk appletvsimulator -destination "name=Apple TV 4K (at 1080p)" | xcpretty -c -r html --output $TEST_REPORTS/tvOS.html
- name: Run Unit Test - Swift Package Manager
run: |
cd XCode
swift build && swift test
- name: Archive Test results
uses: actions/upload-artifact@v1
with:
name: test-results
path: tmp/test-results
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ All notable changes to this project will be documented in this file. Changes not
- Use `swift_version` CocoaPods DSL. ([#425](https://github.com/httpswift/swifter/pull/425)) by [@dnkoutso](https://github.com/dnkoutso)
- Fix compiler warnings in Socket+File.swift for iOS, tvOS, and Linux platforms by using `withUnsafeBytes` rather than `&` to get a scoped UnsafeRawPointer ([#445](https://github.com/httpswift/swifter/pull/445)) by [@kbongort](https://github.com/kbongort).
- Fix tests on linux by importing FoundationNetworking for NSURLSession APIs. ([#446](https://github.com/httpswift/swifter/pull/446)) by [@kbongort](https://github.com/kbongort)
- Replace CircleCI for continuous integration in favor of Github Actions. ([#446](https://github.com/httpswift/swifter/pull/446)) by [@Vkt0r](https://github.com/Vkt0r)

# [1.4.7]

Expand Down
2 changes: 1 addition & 1 deletion XCode/Tests/ServerThreadingTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class ServerThreadingTests: XCTestCase {
super.tearDown()
}

func testShouldHandleTheSameRequestWithDifferentTimeIntervals() {
func testShouldHandleTheRequestInDifferentTimeIntervals() {

let path = "/a/:b/c"
let queue = DispatchQueue(label: "com.swifter.threading")
Expand Down
2 changes: 1 addition & 1 deletion XCode/Tests/XCTestManifests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ extension ServerThreadingTests {
// `swift test --generate-linuxmain`
// to regenerate.
static let __allTests__ServerThreadingTests = [
("testShouldHandleTheRequestInDifferentTimeIntervals", testShouldHandleTheRequestInDifferentTimeIntervals),
("testShouldHandleTheSameRequestConcurrently", testShouldHandleTheSameRequestConcurrently),
("testShouldHandleTheSameRequestWithDifferentTimeIntervals", testShouldHandleTheSameRequestWithDifferentTimeIntervals),
]
}

Expand Down