Skip to content

Commit

Permalink
[ci] better; [deps] update
Browse files Browse the repository at this point in the history
  • Loading branch information
mxcl committed May 27, 2021
1 parent fc30d08 commit 985f17f
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 22 deletions.
42 changes: 26 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@ on: pull_request

jobs:

linux-3:
linux:
runs-on: ubuntu-latest
strategy:
matrix:
swift:
- 4.0.0
- 4.0.3
- 4.1.2
- 4.1.3
- 4.2.4
- 5.0.3
- 5.1.5
Expand All @@ -22,23 +21,24 @@ jobs:
steps:
- uses: actions/checkout@v2
- run: |
if [[ ${v:1} == '4' ]]; then
echo "VERSIONS=3 4" >> "$GITHUB_ENV"
if [ ${v:0:1} == 4 ]; then
echo "VERSIONS=3 4" >> $GITHUB_ENV
else
echo "VERSIONS=4 4.2 5" >> "$GITHUB_ENV"
echo "VERSIONS=4 4.2 5" >> $GITHUB_ENV
fi
shell: bash
env:
v: ${{ matrix.swift }}
- run: |
for v in $VERSIONS; do
swift build -Xswiftc -swift-version -Xswiftc $v
swift build -Xswiftc -warnings-as-errors -Xswiftc -swift-version -Xswiftc $v
done
swiftpm:
macOS:
runs-on: macos-10.15
strategy:
matrix:
xcode: [^9, ^10, ^11, ^12]
xcode: [^10, ^11, ^12]
steps:
- uses: maxim-lobanov/setup-xcode@v1
with:
Expand All @@ -50,34 +50,44 @@ jobs:
runs-on: macos-10.15
strategy:
matrix:
xcode: [^9, ^10, ^11, ^12]
xcode: [^10, ^11, ^12]
steps:
- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: ${{ matrix.xcode }}
- uses: actions/checkout@v2
- run: sed -i '' "s/SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;/SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;/" *.xcodeproj/project.pbxproj
- uses: mingjun97/file-regex-replace@v1
with:
regex: SWIFT_TREAT_WARNINGS_AS_ERRORS = NO
replacement: SWIFT_TREAT_WARNINGS_AS_ERRORS = YES
include: project.pbxproj
- run: |
if [[ ${{ martix.xcode }} == '^12' ]]; then
echo "CARTHAGE_ARGS=--use-xcframeworks" >> "$GITHUB_ENV"
if [ ${{ matrix.xcode }} == ^12 ]; then
echo "CARTHAGE_ARGS=--use-xcframeworks" >> $GITHUB_ENV
fi
- run: carthage build --no-skip-current $CARTHAGE_ARGS
- run: carthage bootstrap --no-use-binaries $CARTHAGE_ARGS
- run: carthage build --no-skip-current --no-use-binaries $CARTHAGE_ARGS

test:
runs-on: macos-10.15
strategy:
matrix:
dst:
- platform=macOS
- platform=tvOS Simulator,OS=14.3,name=Apple TV
- platform=iOS Simulator,OS=14.4,name=iPhone 12
- platform=tvOS Simulator,OS=12.4,name=Apple TV
- platform=iOS Simulator,OS=12.4,name=iPhone SE
steps:
- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: ^10 # 10 as Xcode 11 & 12 forces xcframeworks and we dunno how to handle that yet
- uses: actions/checkout@v2
- run: carthage bootstrap --no-use-binaries
- uses: sersoft-gmbh/xcodebuild-action@v1
with:
project: PMKFoundation.xcodeproj
scheme: PMKFoundation
destination: ${{ matrix.dst }}
action: test
enable-code-coverage: true
use-xcpretty: false
- uses: codecov/codecov-action@v1
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "mxcl/PromiseKit" ~> 6.8.4
github "mxcl/PromiseKit" ~> 6.14.0
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "AliSoftware/OHHTTPStubs" "7.0.0"
github "mxcl/PromiseKit" "6.15.1"
github "mxcl/PromiseKit" "6.15.2"
4 changes: 2 additions & 2 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"repositoryURL": "https://github.com/mxcl/PromiseKit.git",
"state": {
"branch": null,
"revision": "c0d2c0d026a207a64bcfe2a15a9b16a2d96991bb",
"version": "6.15.1"
"revision": "44402644d7973879153784b02c0745de32634a35",
"version": "6.15.2"
}
}
]
Expand Down
3 changes: 1 addition & 2 deletions README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

This project adds promises to the Swift Foundation framework.

We support iOS, tvOS, watchOS, macOS and Linux, Swift 3.0, 3.1, 3.2, 4.0, 4.1,
4.2 and 5.0.
We support iOS, tvOS, watchOS, macOS and Linux, Swift 3.2 and above.

## CococaPods

Expand Down

0 comments on commit 985f17f

Please sign in to comment.