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.

Sign up for GitHub

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

Re-enable reject_build_waiting_for_review after Fastlane upgrade #23374

Merged
merged 2 commits into from
Jun 19, 2024
Merged

Re-enable reject_build_waiting_for_review after Fastlane upgrade #23374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2eff152
Update Fastlane to version 2.221.0 to get ASC-interfacing bug fix
mokagio Jun 19, 2024
47579c3
Re-enable `reject_build_waiting_for_review` after Fastlane upgrade
mokagio Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ gem 'cocoapods', '~> 1.14'
gem 'commonmarker'
gem 'danger-dangermattic', '~> 1.0'
gem 'dotenv'
# 2.219.0 includes a fix for a bug introduced in 2.218.0
# See https://github.com/fastlane/fastlane/issues/21762#issuecomment-1875208663
gem 'fastlane', '~> 2.219'
# 2.221.0 includes a fix for an ASC-interfacing bug
#
# See https://github.com/wordpress-mobile/WordPress-iOS/pull/23118#issuecomment-2173254418
# and https://github.com/fastlane/fastlane/pull/21995
gem 'fastlane', '~> 2.221'
gem 'fastlane-plugin-appcenter', '~> 2.1'
gem 'fastlane-plugin-sentry'
# This comment avoids typing to switch to a development version for testing.
Expand Down
26 changes: 14 additions & 12 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ GEM
ast (2.4.2)
atomos (0.1.3)
aws-eventstream (1.3.0)
aws-partitions (1.926.0)
aws-sdk-core (3.194.2)
aws-partitions (1.944.0)
aws-sdk-core (3.197.0)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.8)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.80.0)
aws-sdk-core (~> 3, >= 3.193.0)
aws-sdk-kms (1.85.0)
aws-sdk-core (~> 3, >= 3.197.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.149.1)
aws-sdk-core (~> 3, >= 3.194.0)
aws-sdk-s3 (1.152.3)
aws-sdk-core (~> 3, >= 3.197.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.8)
aws-sigv4 (1.8.0)
Expand Down Expand Up @@ -163,7 +163,7 @@ GEM
faraday_middleware (1.2.0)
faraday (~> 1.0)
fastimage (2.3.1)
fastlane (2.220.0)
fastlane (2.221.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
Expand Down Expand Up @@ -268,22 +268,22 @@ GEM
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
highline (2.0.3)
http-cookie (1.0.5)
http-cookie (1.0.6)
domain_name (~> 0.5)
httpclient (2.8.3)
i18n (1.14.4)
concurrent-ruby (~> 1.0)
java-properties (0.3.0)
jmespath (1.6.2)
json (2.7.2)
jwt (2.8.1)
jwt (2.8.2)
base64
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
language_server-protocol (3.17.0.3)
mini_magick (4.12.0)
mini_magick (4.13.1)
mini_mime (1.1.5)
mini_portile2 (2.8.5)
minitest (5.22.3)
Expand Down Expand Up @@ -329,7 +329,8 @@ GEM
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rexml (3.2.6)
rexml (3.2.9)
strscan
rmagick (3.2.0)
rouge (2.0.7)
rubocop (1.63.1)
Expand Down Expand Up @@ -363,6 +364,7 @@ GEM
simctl (1.6.10)
CFPropertyList
naturally
strscan (3.1.0)
terminal-notifier (2.0.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
Expand Down Expand Up @@ -398,7 +400,7 @@ DEPENDENCIES
commonmarker
danger-dangermattic (~> 1.0)
dotenv
fastlane (~> 2.219)
fastlane (~> 2.221)
fastlane-plugin-appcenter (~> 2.1)
fastlane-plugin-sentry
fastlane-plugin-wpmreleasetoolkit (~> 11.0)
Expand Down
6 changes: 1 addition & 5 deletions fastlane/lanes/build.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,11 +435,7 @@ def upload_build_to_testflight(whats_new_path:, distribution_groups:)
distribute_external: true,
groups: distribution_groups,
# If there is a build waiting for beta review, we ~~want~~ would like to to reject that so the new build can be submitted instead.
# Unfortunately, this is not (no longer?) possible via the ASC API.
# See https://github.com/fastlane/fastlane/issues/18408
#
# As a quick workaround to avoid CI failures, let's explicitly disable rejecting builds waiting for review.
reject_build_waiting_for_review: false
reject_build_waiting_for_review: true
)
end

Expand Down
Loading