Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Linux Tests on 4.2 #8

Merged
merged 5 commits into from
Oct 13, 2018
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: 2
jobs:
build:
macos:
xcode: "9.3.0"
xcode: "10.0.0"

steps:
- checkout
Expand Down
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
swift-4.2-CONVERGENCE
4.2
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
os:
- osx
osx_image: xcode10
-os:
- linux
env:
language: generic
dist: trusty
install:
- if [ $TRAVIS_OS_NAME = linux ]; then
eval "$(curl -sL https://swiftenv.fuller.li/install.sh)";
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM norionomura/swift:412
FROM norionomura/swift:42

WORKDIR /package

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ test-ios:
set -o pipefail && \
xcodebuild test \
-scheme NonEmpty-Package \
-destination platform="iOS Simulator,name=iPhone 8,OS=11.3" \
-destination platform="iOS Simulator,name=iPhone XR,OS=12.0" \
| xcpretty

test-swift:
Expand Down
3 changes: 2 additions & 1 deletion Sources/NonEmpty/NonEmpty+RandomAccessCollection.swift
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
extension NonEmpty: RandomAccessCollection where C: RandomAccessCollection {}
// https://bugs.swift.org/browse/SR-8985
//extension NonEmpty: RandomAccessCollection where C: RandomAccessCollection {}
2 changes: 1 addition & 1 deletion Tests/LinuxMain.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated using Sourcery 0.11.2 — https://github.com/krzysztofzablocki/Sourcery
// Generated using Sourcery 0.13.1 — https://github.com/krzysztofzablocki/Sourcery
// DO NOT EDIT

import XCTest
Expand Down