Skip to content

Commit d117c12

Browse files
authored
Merge pull request #791 from Quick/8.x-tweak-ci
[8.x] Tweak CI
2 parents 763425d + 00c7833 commit d117c12

File tree

3 files changed

+41
-28
lines changed

3 files changed

+41
-28
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,20 @@ on:
99
- "*"
1010

1111
jobs:
12+
cocoapods:
13+
name: CocoaPods Lint
14+
runs-on: macos-latest
15+
steps:
16+
- uses: actions/checkout@v2
17+
- run: bundle install
18+
- run: ./test podspec
19+
1220
xcode:
1321
name: Xcode ${{ matrix.xcode }}
1422
runs-on: macos-latest
1523
strategy:
1624
matrix:
17-
xcode: [11, 11.1, 11.2]
25+
xcode: [10.3, 11, 11.1, 11.2]
1826
fail-fast: false
1927
env:
2028
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app

.travis.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@ branches:
66
language: generic
77
jobs:
88
include:
9-
- &cocoapods
10-
name: CocoaPods Lint
11-
os: osx
12-
osx_image: xcode10.3
13-
install: bundle install
14-
script: ./test podspec
159
- &xcode
1610
name: Xcode 10.1 / Swift 4.2
1711
os: osx
@@ -20,9 +14,6 @@ jobs:
2014
- ./test macos
2115
- ./test ios
2216
- ./test tvos
23-
- <<: *xcode
24-
name: Xcode 10.3 / Swift 5.0
25-
osx_image: xcode10.3
2617
- &swiftpm_darwin
2718
name: SwiftPM / Darwin / Swift 4.2
2819
os: osx

Gemfile.lock

Lines changed: 32 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,79 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.0)
5-
activesupport (4.2.11.1)
4+
CFPropertyList (3.0.2)
5+
activesupport (4.2.11.3)
66
i18n (~> 0.7)
77
minitest (~> 5.1)
88
thread_safe (~> 0.3, >= 0.3.4)
99
tzinfo (~> 1.1)
10+
algoliasearch (1.27.3)
11+
httpclient (~> 2.8, >= 2.8.3)
12+
json (>= 1.5.1)
1013
atomos (0.1.3)
11-
claide (1.0.2)
12-
cocoapods (1.7.1)
14+
claide (1.0.3)
15+
cocoapods (1.9.3)
1316
activesupport (>= 4.0.2, < 5)
1417
claide (>= 1.0.2, < 2.0)
15-
cocoapods-core (= 1.7.1)
18+
cocoapods-core (= 1.9.3)
1619
cocoapods-deintegrate (>= 1.0.3, < 2.0)
1720
cocoapods-downloader (>= 1.2.2, < 2.0)
1821
cocoapods-plugins (>= 1.0.0, < 2.0)
1922
cocoapods-search (>= 1.0.0, < 2.0)
2023
cocoapods-stats (>= 1.0.0, < 2.0)
21-
cocoapods-trunk (>= 1.3.1, < 2.0)
24+
cocoapods-trunk (>= 1.4.0, < 2.0)
2225
cocoapods-try (>= 1.1.0, < 2.0)
2326
colored2 (~> 3.1)
2427
escape (~> 0.0.4)
25-
fourflusher (>= 2.2.0, < 3.0)
28+
fourflusher (>= 2.3.0, < 3.0)
2629
gh_inspector (~> 1.0)
2730
molinillo (~> 0.6.6)
2831
nap (~> 1.0)
2932
ruby-macho (~> 1.4)
30-
xcodeproj (>= 1.8.2, < 2.0)
31-
cocoapods-core (1.7.1)
33+
xcodeproj (>= 1.14.0, < 2.0)
34+
cocoapods-core (1.9.3)
3235
activesupport (>= 4.0.2, < 6)
36+
algoliasearch (~> 1.0)
37+
concurrent-ruby (~> 1.1)
3338
fuzzy_match (~> 2.0.4)
3439
nap (~> 1.0)
40+
netrc (~> 0.11)
41+
typhoeus (~> 1.0)
3542
cocoapods-deintegrate (1.0.4)
36-
cocoapods-downloader (1.2.2)
43+
cocoapods-downloader (1.3.0)
3744
cocoapods-plugins (1.0.0)
3845
nap
3946
cocoapods-search (1.0.0)
4047
cocoapods-stats (1.1.0)
41-
cocoapods-trunk (1.3.1)
48+
cocoapods-trunk (1.5.0)
4249
nap (>= 0.8, < 2.0)
4350
netrc (~> 0.11)
44-
cocoapods-try (1.1.0)
51+
cocoapods-try (1.2.0)
4552
colored2 (3.1.2)
46-
concurrent-ruby (1.1.5)
53+
concurrent-ruby (1.1.6)
4754
escape (0.0.4)
48-
fourflusher (2.3.0)
55+
ethon (0.12.0)
56+
ffi (>= 1.3.0)
57+
ffi (1.13.0)
58+
fourflusher (2.3.1)
4959
fuzzy_match (2.0.4)
5060
gh_inspector (1.1.3)
61+
httpclient (2.8.3)
5162
i18n (0.9.5)
5263
concurrent-ruby (~> 1.0)
53-
minitest (5.11.3)
64+
json (2.3.0)
65+
minitest (5.14.1)
5466
molinillo (0.6.6)
5567
nanaimo (0.2.6)
5668
nap (1.1.0)
5769
netrc (0.11.0)
5870
ruby-macho (1.4.0)
5971
thread_safe (0.3.6)
60-
tzinfo (1.2.5)
72+
typhoeus (1.4.0)
73+
ethon (>= 0.9.0)
74+
tzinfo (1.2.7)
6175
thread_safe (~> 0.1)
62-
xcodeproj (1.9.0)
76+
xcodeproj (1.16.0)
6377
CFPropertyList (>= 2.3.3, < 4.0)
6478
atomos (~> 0.1.3)
6579
claide (>= 1.0.2, < 2.0)
@@ -73,4 +87,4 @@ DEPENDENCIES
7387
cocoapods (~> 1.7)
7488

7589
BUNDLED WITH
76-
1.17.3
90+
2.1.4

0 commit comments

Comments
 (0)