Skip to content

Commit 187fbfa

Browse files
authored
Work around Fastlane pipeline bug (#118)
Workaround for fastlane/fastlane#29587
1 parent bf05726 commit 187fbfa

3 files changed

Lines changed: 34 additions & 16 deletions

File tree

macOS/Gemfile.lock

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,26 @@ GEM
1010
public_suffix (>= 2.0.2, < 7.0)
1111
artifactory (3.0.17)
1212
atomos (0.1.3)
13-
aws-eventstream (1.3.2)
14-
aws-partitions (1.1102.0)
15-
aws-sdk-core (3.223.0)
13+
aws-eventstream (1.4.0)
14+
aws-partitions (1.1118.0)
15+
aws-sdk-core (3.226.0)
1616
aws-eventstream (~> 1, >= 1.3.0)
1717
aws-partitions (~> 1, >= 1.992.0)
1818
aws-sigv4 (~> 1.9)
1919
base64
2020
jmespath (~> 1, >= 1.6.1)
2121
logger
22-
aws-sdk-kms (1.100.0)
23-
aws-sdk-core (~> 3, >= 3.216.0)
22+
aws-sdk-kms (1.105.0)
23+
aws-sdk-core (~> 3, >= 3.225.0)
2424
aws-sigv4 (~> 1.5)
25-
aws-sdk-s3 (1.185.0)
26-
aws-sdk-core (~> 3, >= 3.216.0)
25+
aws-sdk-s3 (1.190.0)
26+
aws-sdk-core (~> 3, >= 3.225.0)
2727
aws-sdk-kms (~> 1)
2828
aws-sigv4 (~> 1.5)
29-
aws-sigv4 (1.11.0)
29+
aws-sigv4 (1.12.1)
3030
aws-eventstream (~> 1, >= 1.0.2)
3131
babosa (1.0.4)
32-
base64 (0.2.0)
32+
base64 (0.3.0)
3333
claide (1.1.0)
3434
colored (1.2)
3535
colored2 (3.1.2)
@@ -58,10 +58,10 @@ GEM
5858
faraday (>= 0.8.0)
5959
http-cookie (~> 1.0.0)
6060
faraday-em_http (1.0.0)
61-
faraday-em_synchrony (1.0.0)
61+
faraday-em_synchrony (1.0.1)
6262
faraday-excon (1.1.0)
6363
faraday-httpclient (1.0.1)
64-
faraday-multipart (1.1.0)
64+
faraday-multipart (1.1.1)
6565
multipart-post (~> 2.0)
6666
faraday-net_http (1.0.2)
6767
faraday-net_http_persistent (1.2.0)
@@ -71,7 +71,7 @@ GEM
7171
faraday_middleware (1.2.1)
7272
faraday (~> 1.0)
7373
fastimage (2.4.0)
74-
fastlane (2.227.2)
74+
fastlane (2.228.0)
7575
CFPropertyList (>= 2.3, < 4.0.0)
7676
addressable (>= 2.8, < 3.0.0)
7777
artifactory (~> 3.0)
@@ -161,7 +161,7 @@ GEM
161161
httpclient (2.9.0)
162162
mutex_m
163163
jmespath (1.6.2)
164-
json (2.11.3)
164+
json (2.12.2)
165165
jwt (2.10.1)
166166
base64
167167
logger (1.7.0)
@@ -171,14 +171,14 @@ GEM
171171
multipart-post (2.4.1)
172172
mutex_m (0.3.0)
173173
nanaimo (0.4.0)
174-
naturally (2.2.1)
174+
naturally (2.3.0)
175175
nkf (0.2.0)
176176
optparse (0.6.0)
177177
os (1.1.4)
178-
ostruct (0.6.1)
178+
ostruct (0.6.2)
179179
plist (3.7.2)
180180
public_suffix (6.0.2)
181-
rake (13.2.1)
181+
rake (13.3.0)
182182
representable (3.2.0)
183183
declarative (< 0.1.0)
184184
trailblazer-option (>= 0.1.1, < 0.2.0)

macOS/fastlane/Fastfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
require_relative "spaceship_patch"
2+
13
default_platform(:mac)
24

35
ENV["FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT"] = "120"

macOS/fastlane/spaceship_patch.rb

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
require "spaceship"
2+
3+
# the ASC API has started (June 2025) throwing a fit when it
4+
# sees DEVELOPER_ID_APPLICATION_G2 in the certificate types filter.
5+
# so we patch Spaceship to filter locally instead of via the API.
6+
# c.f. https://github.com/fastlane/fastlane/pull/29588
7+
8+
class << Spaceship::ConnectAPI::Certificate
9+
alias_method :all_orig, :all
10+
11+
def all(**args)
12+
types = args[:filter]&.delete(:certificateType)&.split(",")
13+
certs = all_orig(**args)
14+
types ? certs.select { |cert| types.include?(cert.certificate_type) } : certs
15+
end
16+
end

0 commit comments

Comments
 (0)