Skip to content

Commit

Permalink
Merge pull request #1 from MacPaw/chore/merge-upstream
Browse files Browse the repository at this point in the history
Chore/merge upstream
  • Loading branch information
nekrich authored Oct 23, 2023
2 parents 7b1bad4 + 72d83cd commit deeb763
Show file tree
Hide file tree
Showing 162 changed files with 2,721 additions and 884 deletions.
30 changes: 20 additions & 10 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -261,26 +261,36 @@ workflows:
build:
jobs:
- tests_macos:
name: 'Execute tests on macOS (Xcode 11.7.0, Ruby 2.6)'
xcode_version: '11.7.0'
ruby_version: '2.6'
name: 'Execute tests on macOS (Xcode 12.5.1, Ruby 2.6)'
xcode_version: '12.5.1'
ruby_version: '2.6.6'
<<: *important-branches
- tests_macos:
name: 'Execute tests on macOS (Xcode 12.5.1, Ruby 2.7)'
xcode_version: '12.5.1'
ruby_version: '2.7'
ruby_version: '2.7.3'
ruby_opt: -W:deprecated
<<: *important-branches
- tests_macos:
name: 'Execute tests on macOS (Xcode 13.0.0, Ruby 3.0)'
xcode_version: '13.0.0'
ruby_version: '3.0'
name: 'Execute tests on macOS (Xcode 13.4.1, Ruby 3.0)'
xcode_version: '13.4.1'
ruby_version: '3.0.4'
ruby_opt: -W:deprecated
<<: *important-branches
- tests_macos:
name: 'Execute tests on macOS (Xcode 13.0.0, Ruby 3.1)'
xcode_version: '13.0.0'
ruby_version: '3.1'
name: 'Execute tests on macOS (Xcode 13.4.1, Ruby 3.1)'
xcode_version: '13.4.1'
ruby_version: '3.1.2'
ruby_opt: -W:deprecated
- tests_macos:
name: 'Execute tests on macOS (Xcode 14.3.1, Ruby 3.1)'
xcode_version: '14.3.1'
ruby_version: '3.1.4'
ruby_opt: -W:deprecated
- tests_macos:
name: 'Execute tests on macOS (Xcode 15.0.0, Ruby 3.1)'
xcode_version: '15.0.0'
ruby_version: '3.1.4'
ruby_opt: -W:deprecated
- tests_ubuntu:
name: 'Execute tests on Ubuntu'
Expand Down
8 changes: 6 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
<!-- Thanks for contributing to _fastlane_! Before you submit your pull request, please make sure to check the following boxes by putting an x in the [ ] (don't: [x ], [ x], do: [x]) -->

### Checklist

- [ ] I've run `bundle exec rspec` from the root directory to see all new and existing tests pass
- [ ] I've followed the _fastlane_ code style and run `bundle exec rubocop -a` to ensure the code style is valid
- [ ] I see several green `ci/circleci` builds in the "All checks have passed" section of my PR ([connect CircleCI to GitHub](https://support.circleci.com/hc/en-us/articles/360008097173-Why-aren-t-pull-requests-triggering-jobs-on-my-organization-) if not)
- [ ] I've read the [Contribution Guidelines](https://github.com/fastlane/fastlane/blob/master/CONTRIBUTING.md)
- [ ] I've updated the documentation if necessary.
- [ ] I've added or updated relevant unit tests.

### Motivation and Context

<!-- Why is this change required? What problem does it solve? -->
<!-- If it fixes an open issue, please link to the issue following this format:
Resolves #999999
-->

### Description
<!-- Describe your changes in detail. -->
<!-- Please describe in detail how you tested your changes. -->

<!-- Describe your changes in detail, as well as how you tested them. -->

### Testing Steps

<!-- Optional: steps, commands, or code used to test your changes. -->
<!-- Providing these will reduce the time needed for testing and review by the fastlane team. -->
5 changes: 4 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,9 @@ Style/GuardClause:
Style/StringLiterals:
Enabled: false

Style/QuotedSymbols:
Enabled: false

# something = if something_else
# that's confusing
Style/ConditionalAssignment:
Expand Down Expand Up @@ -315,7 +318,7 @@ Lint/IsStringUsage:
# ( ) for method calls
Style/MethodCallWithArgsParentheses:
Enabled: true
IgnoredMethods:
AllowedMethods:
- 'require'
- 'require_relative'
- 'fastlane_require'
Expand Down
Loading

0 comments on commit deeb763

Please sign in to comment.