Skip to content

Commit

Permalink
Merge branch 'develop' into 'master'
Browse files Browse the repository at this point in the history
Release 4.25.0

See merge request minds/mobile-native!1789
  • Loading branch information
msantang78 committed Jun 13, 2022
2 parents 7ee3b68 + 0a219c0 commit ab282dc
Show file tree
Hide file tree
Showing 138 changed files with 7,233 additions and 5,538 deletions.
49 changes: 23 additions & 26 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ commands:

jobs:
analyse_js:
executor: rn/linux_js
executor:
name: rn/linux_js
node_version: '14.19.1'
steps:
- attach_workspace:
at: .
Expand Down Expand Up @@ -129,7 +131,7 @@ jobs:
configuration: ios.release

orbs:
rn: react-native-community/react-native@5.4.0
rn: react-native-community/react-native@7.0.0
version: 2.1
workflows:
test:
Expand All @@ -138,27 +140,22 @@ workflows:
- analyse_js:
requires:
- checkout_code
- e2e:
requires:
- checkout_code
filters:
branches:
ignore: /^stable.*/
- fastlane_build_qa:
requires:
- analyse_js
filters:
branches:
only: /^(fix|feat|chore|refactor|stable).*/
- e2e_prod:
requires:
- checkout_code
filters:
branches:
only: /^stable.*/
- fastlane_release:
requires:
- analyse_js
- ios-testflight-approval
- ios-testflight-approval:
type: approval
# Disable CI: we moved it to gitlab
# - fastlane_build_qa:
# requires:
# - analyse_js
# filters:
# branches:
# only: /^(fix|feat|chore|refactor|stable).*/
# - e2e_prod:
# requires:
# - checkout_code
# filters:
# branches:
# only: /^stable.*/
# - fastlane_release:
# requires:
# - analyse_js
# - ios-testflight-approval
# - ios-testflight-approval:
# type: approval
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ buck-out/

# CocoaPods
/ios/Pods/
/vendor/bundle/

# Jest cache
.jest/
Expand Down
Loading

0 comments on commit ab282dc

Please sign in to comment.