Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix duplicate use_system_scm option in #17832 #17957

Merged
merged 5 commits into from Jan 14, 2021
Merged

Fix duplicate use_system_scm option in #17832 #17957

merged 5 commits into from Jan 14, 2021

Conversation

plu
Copy link
Contributor

@plu plu commented Jan 13, 2021

No description provided.

This will allow usage of `include("foo").once`
      1) Scan Scan::TestCommandGenerator uses system scm options exactly once
         Failure/Error: expect(result).to include("-scmProvider system").once

           expected ["set -o pipefail &&", "env NSUnbufferedIO=YES xcodebuild", "-scheme app", "-project ./scan/examples/...it --output '/var/folders/qz/91qlx7gn30l6rfcwjfzsv_ph0000gn/T/junit_report20210113-97481-17c5v9n' "] to include "-scmProvider system" once but it is included twice
@google-cla
Copy link

google-cla bot commented Jan 13, 2021

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project (if not, look below for help). Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed (or fixed any issues), please reply here with @googlebot I signed it! and we'll verify it.


What to do if you already signed the CLA

Individual signers
Corporate signers

ℹ️ Googlers: Go here for more info.

@google-cla google-cla bot added the cla: no label Jan 13, 2021
@plu
Copy link
Contributor Author

plu commented Jan 13, 2021

@googlebot I signed it!

@google-cla google-cla bot added cla: yes and removed cla: no labels Jan 13, 2021
@plu plu changed the title Rogerluan fix gym use system scm plu Fix duplicate use_system_scm option in #17832 Jan 13, 2021
@plu
Copy link
Contributor Author

plu commented Jan 13, 2021

Fixes duplicate option use_system_scm in another PR: #17832

Copy link
Contributor

@ainame ainame left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice fix👍
I would leave this PR to @rogerluan to merge.

@@ -102,7 +102,7 @@ Gem::Specification.new do |spec|

# Development only
spec.add_development_dependency('rake')
spec.add_development_dependency('rspec', '~> 3.9.0')
spec.add_development_dependency('rspec', '~> 3.10.0')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you actually need this bump in "this PR"? If so can you please clarify that?

Copy link
Contributor Author

@plu plu Jan 14, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, to get the include(...).once matcher.

@plu
Copy link
Contributor Author

plu commented Jan 14, 2021

Thank you for the review!

Copy link
Member

@rogerluan rogerluan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is great! Really nice to use include(…).once 🌟

Thank you so much for opening a PR fixing the issue and adding tests ❤️

@rogerluan rogerluan merged commit febf68a into fastlane:rogerluan-fix-gym-use-system-scm Jan 14, 2021
@plu plu deleted the rogerluan-fix-gym-use-system-scm_plu branch January 14, 2021 10:23
@fastlane-bot
Copy link

Hey @plu 👋

Thank you for your contribution to fastlane and congrats on getting this pull request merged 🎉
The code change now lives in the master branch, however it wasn't released to RubyGems yet.
We usually ship about once a week, and your PR will be included in the next one.

Please let us know if this change requires an immediate release by adding a comment here 👍
We'll notify you once we shipped a new release with your changes 🚀

joshdholtz pushed a commit that referenced this pull request Jan 15, 2021
…cm` option to snapshot (#17832)

* Fix gym -showBuildSettings command when providing use_system_scm option.
- Also add use_system_scm option to snapshot to fix specs.

* Fix duplicate use_system_scm option in #17832 (#17957)

* Bump rspec version

This will allow usage of `include("foo").once`

* Add failing test

      1) Scan Scan::TestCommandGenerator uses system scm options exactly once
         Failure/Error: expect(result).to include("-scmProvider system").once

           expected ["set -o pipefail &&", "env NSUnbufferedIO=YES xcodebuild", "-scheme app", "-project ./scan/examples/...it --output '/var/folders/qz/91qlx7gn30l6rfcwjfzsv_ph0000gn/T/junit_report20210113-97481-17c5v9n' "] to include "-scmProvider system" once but it is included twice

* Deduplicate scmProvider option

* Fix build command generator

* Remove extra blank line

Co-authored-by: Johannes Plunien <johannes@plunien.de>
@fastlane fastlane locked and limited conversation to collaborators Mar 16, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants