Skip to content

Commit 2eec250

Browse files
authored
Use GitHub Actions (#25)
* Use GitHub actions. * xcode version * xcode * xcode * clean up * Update Makefile * does this work * try * wip * wip * wip * fix * wip * wip * wip * wip * wip * clean up * bring back tests * clean up
1 parent 1b33a67 commit 2eec250

File tree

13 files changed

+47
-125
lines changed

13 files changed

+47
-125
lines changed

.circleci/config.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: CI
2+
3+
on: [push]
4+
5+
jobs:
6+
build:
7+
name: MacOS
8+
runs-on: macOS-latest
9+
steps:
10+
- uses: actions/checkout@v1
11+
- name: Xcode version
12+
run: sudo xcode-select -s /Applications/Xcode_11.3.app
13+
- name: Run tests
14+
run: make test-swift
15+
16+
ubuntu:
17+
name: Ubuntu
18+
runs-on: ubuntu-latest
19+
steps:
20+
- uses: actions/checkout@v1
21+
- name: Run tests
22+
run: make test-linux

.sourcery-templates/LinuxMain.stencil

Lines changed: 0 additions & 16 deletions
This file was deleted.

.swift-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.travis.yml

Lines changed: 0 additions & 11 deletions
This file was deleted.

Development.xcconfig

Lines changed: 0 additions & 3 deletions
This file was deleted.

Dockerfile

Lines changed: 0 additions & 9 deletions
This file was deleted.

Makefile

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
1-
imports = \
2-
@testable import NonEmptyTests;
3-
41
xcodeproj:
52
PF_DEVELOP=1 swift run xcodegen
63

74
linux-main:
8-
sourcery \
9-
--sources ./Tests/ \
10-
--templates ./.sourcery-templates/ \
11-
--output ./Tests/ \
12-
--args testimports='$(imports)' \
13-
&& mv ./Tests/LinuxMain.generated.swift ./Tests/LinuxMain.swift
5+
swift test --generate-linuxmain
146

15-
test-linux: linux-main
16-
docker build --tag nonempty-testing . \
17-
&& docker run --rm nonempty-testing
7+
test-linux:
8+
docker run \
9+
--rm \
10+
-v "$(PWD):$(PWD)" \
11+
-w "$(PWD)" \
12+
swift:5.1 \
13+
bash -c 'make test-swift'
1814

1915
test-macos:
2016
set -o pipefail && \
@@ -31,6 +27,9 @@ test-ios:
3127
| xcpretty
3228

3329
test-swift:
34-
swift test
30+
swift test \
31+
--enable-pubgrub-resolver \
32+
--enable-test-discovery \
33+
--parallel
3534

36-
test-all: test-linux test-mac test-ios
35+
test-all: test-linux test-macos test-ios test-swift

Package.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
// swift-tools-version:5.0
1+
// swift-tools-version:5.1
22
import Foundation
33
import PackageDescription
44

55
let package = Package(
66
name: "NonEmpty",
77
products: [
88
.library(name: "NonEmpty", targets: ["NonEmpty"]),
9-
],
9+
],
1010
targets: [
1111
.target(name: "NonEmpty", dependencies: []),
1212
.testTarget(name: "NonEmptyTests", dependencies: ["NonEmpty"]),
13-
]
13+
]
1414
)
1515

1616
if ProcessInfo.processInfo.environment.keys.contains("PF_DEVELOP") {

0 commit comments

Comments
 (0)