[WIP] Merge 2.225.0 to get on latest Fastlane #10
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* [gym] adds `build_timing_summary` option * [gym] makes the `build_timing_summary` optional * Adds `requires_xcodebuild` flag so that cross-platform tests pass * Addresses comment from PR
…use http 1.1 and retries when installing WWDC certs to fix some CI failures (fastlane#21044)
* Initial commit * Fixes tests * More fixes for tests * Fix casing on headers
The platform condition is filtered on the client side, so enough builds need to be returned to find the correct platform.
…tlane#20976) * [ensure_git_status_clean ] fix unclear param documentation See also: https://git-scm.com/docs/git-status#Documentation/git-status.txt---ignoredltmodegt * Fix incorrect test name * Remove duplicated test * Fix misleading local variable name * Fix typo in test names * [ensure_git_status_clean] fix incorrect "ignored" param handling * [ensure_git_status_clean] fix incorrect "no" value handling * [ensure_git_status_clean] add missing invalid values handling * [ensure_git_status_clean] improve param documentation * Fix RuboCop line length error
…astlane#20738) * Adds support for `build_verify_command` * Updates naming of variable to show the inclusion of `verify` command * Adds required `platform` option * Allows passing in an `asset_path` to upload values correctly * Updates unit tests for `deliver` component * Fixes failing tests in `itunes_transporter_spec` * Runs `rubocop -a` * Uses `**kwargs` for abstract `build_verify_command` method * Fixes `rubocop` violation * Removes `altool_compatible_command` argument from `deliver` runner * Fixes further PR comments * Reverts changes to temporary path code --------- Co-authored-by: Pol Piella <[email protected]>
LatestOsVersion#version_for_os can be catched in a deadlock when
used with Xcode 13.3.0 or later while a device is physically connected
to the computer.
In this case, xcodebuild will return a few lines of errors on stderr
which will trigger a deadlock in Open3#open3. The problem is
mentioned explicitely in the documentation of Open3#open3:
> You should be careful to avoid deadlocks. Since pipes are fixed
> length buffer, #popen3(“prog”) {|i, o, e, t| o.read } deadlocks if
> the program generates many output on stderr. You should be read
> stdout and stderr simultaneously (using thread or IO.select). However
> if you don't need stderr output, #popen2 can be used. If merged
> stdout and stderr output is not a problem, you can use #popen2e.
> If you really needs stdout and stderr output as separate strings,
> you can consider #capture3.
Using Open3#capture2 or Open3#open2 would show the error in the
terminal, but Open3#capture3 allows us to capture only stdout and
hide stderr from the users eyes.
* Remove prices from ESSENTIAL_INCLUDES closes fastlane#21125 * Fix spec * Fix violations * Fix stubs
…ane#21088) * [ci] Only run all mac jobs on master and version bump branches * Fix main to master
…up if on Intel (fastlane#21284) * Added arch=x86_64 for scan * Make as an option * Only do for iOS
…tly ignoring files (fastlane#21283)
ng tier election to correctly handle nil value
…ne#21279) * Adding access token prompt for GitLab Secure Files Match * Removing commented code
Co-authored-by: Darby Frey <[email protected]>
… match documentation examples (fastlane#21302) * Incorporate changes made in fastlane/docs#1196. * Improve wording and fix typos.
…astlane#21310) * Fix Style/StringLiterals RuboCap warning More information about warning: https://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Style/StringLiterals * Fix indentation of template Action, reported by Rubocop https://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Layout/IndentationWidth * Fix Layout/LineLength: Line is too long, reported by Rubocop More information: https://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Layout/LineLength * Fix Style/MethodCallWithArgsParentheses reported by Rubocop * Fix Style/ParenthesesAroundCondition, Style/AndOr and Style/Not Fixes: * Style/ParenthesesAroundCondition: Don't use parentheses around the condition of an unless. * Style/AndOr: Use && instead of and. * Style/Not: Use ! instead of not.
… parameter (fastlane#22235) * Add an icon_emoji parameter to Slack API client * Integrate the icon_emoji parameter in Slack action * Improve documentation for Slack icon_url parameter * Update test asserting new parameter
…stlane#22228) * Add force encrytion mode flag to openssl class * Pass through force legacy encryption flag for encryption * Add option to match action * Add parameter to the actual class * Add tests * Clean up formatting of spec * Fix macos tests
…22128) * Add regression test case * Make deliver accept Individual API Key * Apply the same changes as deliver to pilot * Fix coding style * Do not leak state changes of Spaceship::ConnectAPI.token
* add package_authorization_provider argument to xcodebuild * add documentation for packageAuthorizationProvider, fix failing test for visionOS * fix typo * fix visionOS tests * Update snapshot/lib/snapshot/options.rb Co-authored-by: iulianOnofrei (U-lee-aan) <[email protected]> * added verify block for package authorization provider argument --------- Co-authored-by: iulianOnofrei (U-lee-aan) <[email protected]>
* Version bump to 2.223.0 * Update CHANGELOG.latest.md --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Josh Holtz <[email protected]>
…2256) * [core] fix duplicate builds being matched in BuildWatcher * Fix lint and tests
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
… provided TeamID (fastlane#22199) * [Match][S3] Only download files from the bucket which are corresponding to the provided TeamID * Better code style/API conventions for helper
…bclassing LaneFile (fastlane#20563) * Refactored onError to be open instead of public Allowing subclasses to override the onError function * Added beforeAll and afterAll lifecycles Allowing subclasses to override the lifecycles
…itialized constant Fastlane::OpenStruct (NameError) (fastlane#21950) * Update erb_template_helper.rb add require 'ostruct' * Update erb_template_helper.rb
Make sure all individual test files pass when ran on their own.
* [spaceship] Add support for Enterprise Program API * [spaceship] Add Enterprise stats Thanks @AlexTrott for noticing * [spaceship] Update stats spec for Enterprise * Test ConnectAPI::APIClient.hostname * Test JWT audience field * lint fixes * nit: add slash
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* Detect failing standalone tests * Add the RPSEC_ARGS to allow the user to add more arguments * Update doc * Typo
* [spaceship] New AppleID Auth with SIRP * Doesn't print things out * Using new fastlane-sirp gem * Fixed some lint * Added feature flag for legacy * Maybe tests will pass * Fixed a lot of tests * This should go all green * Fix some stuff * Now all green * Fix more tests * One more fix * Using proper error * Added debug logs * Code improvements from PR review
* Version bump to 2.225.0 * Update CHANGELOG.latest.md --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Josh Holtz <[email protected]>
addbrick
approved these changes
Oct 24, 2024
|
@addbrick good idea, I've also added conflict resolution screenshots (4 compares) could you glance if all look good (I have too little context on those) cc @gmartinimighty |
|
@eugene-mighty those conflict resolutions look good. A couple of them even look like a change we made got into the source code base. |
addbrick
changed the title
addbrick
changed the base branch from
gmartini/base-territory-support
to
brick/pem-login-fix
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ticket: https://mightynetworks.atlassian.net/browse/PLAT-3281
Resolved conflicts