Skip to content

Commit

Permalink
Run tests in iOS 14
Browse files Browse the repository at this point in the history
- Upgrade Xcode and iOS versions
- Add fix image script to CI
- Update ruby version and lockfile
- Update lockfile for KanvasCameraExample
- Remove iOS version from CI config
- Pin iOS simulator version
  • Loading branch information
bjtitus authored and jschementi committed Oct 27, 2020
1 parent 7d70dae commit 0a7109d
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 13 deletions.
19 changes: 17 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,34 @@ version: 2.1
orbs:
ios: wordpress-mobile/[email protected]
git: wordpress-mobile/[email protected]
commands:
fix-image:
steps:
- run:
name: Fix CI Image
command: |
# Add `/usr/local/bin` to the Xcode 11.2 image's $PATH in order to be able to use dependencies
if [ $(echo $PATH | ruby -e "puts Kernel.gets.include?('/usr/local/bin')") != "true" ]; then
echo 'export PATH=/usr/local/bin:$PATH' >> $BASH_ENV
echo "Manually added `/usr/local/bin` to the $PATH:"
echo $PATH
fi
chruby ruby-2.6.6
gem install bundler
jobs:
build:
executor:
name: ios/default
xcode-version: "11.2.1"
xcode-version: "12.0.0"
steps:
- fix-image
- git/shallow-checkout
- ios/test:
xcode-version: 11.2.1
workspace: KanvasCameraExample/KanvasCameraExample.xcworkspace
scheme: KanvasCameraExample
device: iPhone 8
ios-version: 13.2.2
ios-version: "14.0"
bundle-install: true
bundler-working-directory: KanvasCameraExample
pod-install: true
Expand Down
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.6.5
10 changes: 5 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
algoliasearch (1.27.3)
algoliasearch (1.27.4)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
Expand Down Expand Up @@ -50,7 +50,7 @@ GEM
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.1.6)
concurrent-ruby (1.1.7)
escape (0.0.4)
ethon (0.12.0)
ffi (>= 1.3.0)
Expand All @@ -62,7 +62,7 @@ GEM
i18n (0.9.5)
concurrent-ruby (~> 1.0)
json (2.3.1)
minitest (5.14.1)
minitest (5.14.2)
molinillo (0.6.6)
nanaimo (0.3.0)
nap (1.1.0)
Expand All @@ -73,7 +73,7 @@ GEM
ethon (>= 0.9.0)
tzinfo (1.2.7)
thread_safe (~> 0.1)
xcodeproj (1.17.1)
xcodeproj (1.19.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
Expand All @@ -87,4 +87,4 @@ DEPENDENCIES
cocoapods (= 1.9.1)!

BUNDLED WITH
1.17.2
2.1.4
12 changes: 6 additions & 6 deletions KanvasCameraExample/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
algoliasearch (1.27.3)
algoliasearch (1.27.4)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
Expand Down Expand Up @@ -40,7 +40,7 @@ GEM
netrc (~> 0.11)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.4)
cocoapods-downloader (1.3.0)
cocoapods-downloader (1.4.0)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
Expand All @@ -50,7 +50,7 @@ GEM
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.1.6)
concurrent-ruby (1.1.7)
escape (0.0.4)
ethon (0.12.0)
ffi (>= 1.3.0)
Expand All @@ -62,7 +62,7 @@ GEM
i18n (0.9.5)
concurrent-ruby (~> 1.0)
json (2.3.1)
minitest (5.14.1)
minitest (5.14.2)
molinillo (0.6.6)
nanaimo (0.3.0)
nap (1.1.0)
Expand All @@ -73,7 +73,7 @@ GEM
ethon (>= 0.9.0)
tzinfo (1.2.7)
thread_safe (~> 0.1)
xcodeproj (1.18.0)
xcodeproj (1.19.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
Expand All @@ -87,4 +87,4 @@ DEPENDENCIES
cocoapods (= 1.9.3)!

BUNDLED WITH
1.17.2
2.0.2
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@
<Test
Identifier = "CameraSegmentHandlerTests/testMerge()">
</Test>
<Test
Identifier = "FilteredInputViewControllerTests/testFilteredInputView()">
</Test>
<Test
Identifier = "GIFEncoderTests">
</Test>
Expand All @@ -68,6 +71,9 @@
<Test
Identifier = "GLPlayerTests">
</Test>
<Test
Identifier = "MediaPlayerTests/testPlayVideo()">
</Test>
</SkippedTests>
</TestableReference>
</Testables>
Expand Down

0 comments on commit 0a7109d

Please sign in to comment.