Skip to content

Commit 1f90316

Browse files
Merge branch 'master' into a11y-crash
2 parents 51d2c58 + a548189 commit 1f90316

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+3139
-2443
lines changed

.circleci/config.yml

Lines changed: 62 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
version: 2.1
22

33
orbs:
4-
rn: react-native-community/react-native@1.2.1
4+
rn: react-native-community/react-native@5.5.0
5+
windows: circleci/windows@2.4.0
56

67
jobs:
78
checkout_code:
@@ -11,7 +12,8 @@ jobs:
1112
- persist_to_workspace:
1213
root: .
1314
paths: .
14-
analyse:
15+
16+
verify:
1517
executor: rn/linux_js
1618
steps:
1719
- attach_workspace:
@@ -23,16 +25,49 @@ jobs:
2325
- run:
2426
name: Flow
2527
command: yarn run validate:flow
28+
29+
test:
30+
executor: rn/linux_js
31+
steps:
32+
- attach_workspace:
33+
at: .
34+
- rn/yarn_install
2635
- run:
27-
name: Jest
36+
name: Run unit tests with Jest
2837
command: yarn run test:jest
29-
# TODO: Uncomment after fixing detox setup
30-
# - run:
31-
# name: Build Android JavaScript Bundle
32-
# command: yarn run test:detox:android:bundle:release
33-
# - run:
34-
# name: Build iOS JavaScript Bundle
35-
# command: yarn run test:detox:ios:bundle:release
38+
39+
build_example_windows:
40+
executor:
41+
name: windows/default
42+
shell: powershell
43+
steps:
44+
- checkout
45+
- run:
46+
name: Install examples
47+
command: cd src; yarn install; cd ../example; yarn install --force --frozen-lockfile
48+
- run:
49+
name: "Restore NuGet packages for Components"
50+
command: nuget restore .\example\windows\SliderTestWindows.sln
51+
- run:
52+
name: "Restore .NET dependencies"
53+
command: msbuild -t:restore .\example\windows\SliderTestWindows.sln
54+
- run:
55+
name: Build example Windows
56+
command: cd example; npx react-native run-windows --no-packager --no-launch --arch x64 --logging --no-deploy
57+
58+
build_example_ios:
59+
executor: rn/macos
60+
steps:
61+
- checkout
62+
- run:
63+
name: Install deps
64+
command: cd src && yarn install && cd ../example && yarn install --force --frozen-lockfile
65+
- run:
66+
name: Install Pods
67+
command: cd example && npx pod-install
68+
- run:
69+
name: Build the iOS example project
70+
command: cd example/ios && export RCT_NO_LAUNCH_PACKAGER=true && xcodebuild -workspace example.xcworkspace -destination 'platform=iOS Simulator,name=iPhone 11' -scheme example -parallelizeTargets -configuration Debug -derivedDataPath build -UseModernBuildSystem=YES
3671

3772
# To be uncommented as a part of https://github.com/react-native-community/react-native-slider/issues/34
3873
# publish:
@@ -46,41 +81,27 @@ jobs:
4681
# command: yarn ci:publish
4782

4883
workflows:
49-
test:
84+
slider-full-ci:
5085
jobs:
5186
- checkout_code
52-
- analyse:
87+
- verify:
5388
requires:
5489
- checkout_code
55-
# Disabled until Detox works correctly with 0.60
56-
# - rn/android_build:
57-
# name: build_android_debug
58-
# project_path: "example/android"
59-
# build_type: debug
60-
# requires:
61-
# - analyse
62-
# - rn/android_build:
63-
# name: build_android_release
64-
# project_path: "example/android"
65-
# build_type: release
66-
# requires:
67-
# - analyse
68-
# - rn/android_test:
69-
# detox_configuration: "android.emu.release"
70-
# detox_loglevel: "trace"
71-
# requires:
72-
# - build_android_release
73-
# - rn/ios_build_and_test:
74-
# project_path: "example/ios/example.xcworkspace"
75-
# derived_data_path: "example/ios/build"
76-
# device: "iPhone X"
77-
# build_configuration: "Release"
78-
# scheme: "example"
79-
# detox_configuration: "ios.sim.release"
80-
# detox_loglevel: "trace"
81-
# requires:
82-
# - analyse
83-
# To be uncommented as a part of https://github.com/react-native-community/react-native-slider/issues/34
90+
- test:
91+
requires:
92+
- verify
93+
- build_example_windows:
94+
requires:
95+
- verify
96+
- rn/android_build:
97+
name: build_android_debug
98+
project_path: "example/android"
99+
build_type: debug
100+
requires:
101+
- verify
102+
- build_example_ios:
103+
requires:
104+
- verify
84105
# - publish:
85106
# requires:
86107
# - analyse
539 KB
Loading
1.06 MB
Loading
2.99 MB
Loading

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
#
33
.DS_Store
44

5+
# Windows OS
6+
#
7+
msbuild.binlog
8+
59
# Xcode
610
#
711
build/
@@ -40,6 +44,7 @@ yarn-error.log
4044
buck-out/
4145
\.buckd/
4246
*.keystore
47+
!debug.keystore
4348

4449
# fastlane
4550
#

.npmignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
/.github
33
/example
44
/src/android/build
5+
**/__tests__/**/*

0 commit comments

Comments
 (0)