Skip to content

armgit / xtool

Public Imported from GitHub
0

Cross-platform Xcode replacement. Build and deploy iOS apps with SwiftPM on Linux, Windows, macOS.

Work around Fastlane pipeline bug (#118)

Kabir Oberai187fbfa67b14
diff --git a/macOS/Gemfile.lock b/macOS/Gemfile.lock
index 29aa2fb..e00837a 100644
--- a/macOS/Gemfile.lock
+++ b/macOS/Gemfile.lock
@@ -10,26 +10,26 @@ GEM
public_suffix (>= 2.0.2, < 7.0)
artifactory (3.0.17)
atomos (0.1.3)
- aws-eventstream (1.3.2)
- aws-partitions (1.1102.0)
- aws-sdk-core (3.223.0)
+ aws-eventstream (1.4.0)
+ aws-partitions (1.1118.0)
+ aws-sdk-core (3.226.0)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.992.0)
aws-sigv4 (~> 1.9)
base64
jmespath (~> 1, >= 1.6.1)
logger
- aws-sdk-kms (1.100.0)
- aws-sdk-core (~> 3, >= 3.216.0)
+ aws-sdk-kms (1.105.0)
+ aws-sdk-core (~> 3, >= 3.225.0)
aws-sigv4 (~> 1.5)
- aws-sdk-s3 (1.185.0)
- aws-sdk-core (~> 3, >= 3.216.0)
+ aws-sdk-s3 (1.190.0)
+ aws-sdk-core (~> 3, >= 3.225.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
- aws-sigv4 (1.11.0)
+ aws-sigv4 (1.12.1)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
- base64 (0.2.0)
+ base64 (0.3.0)
claide (1.1.0)
colored (1.2)
colored2 (3.1.2)
@@ -58,10 +58,10 @@ GEM
faraday (>= 0.8.0)
http-cookie (~> 1.0.0)
faraday-em_http (1.0.0)
- faraday-em_synchrony (1.0.0)
+ faraday-em_synchrony (1.0.1)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
- faraday-multipart (1.1.0)
+ faraday-multipart (1.1.1)
multipart-post (~> 2.0)
faraday-net_http (1.0.2)
faraday-net_http_persistent (1.2.0)
@@ -71,7 +71,7 @@ GEM
faraday_middleware (1.2.1)
faraday (~> 1.0)
fastimage (2.4.0)
- fastlane (2.227.2)
+ fastlane (2.228.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
@@ -161,7 +161,7 @@ GEM
httpclient (2.9.0)
mutex_m
jmespath (1.6.2)
- json (2.11.3)
+ json (2.12.2)
jwt (2.10.1)
base64
logger (1.7.0)
@@ -171,14 +171,14 @@ GEM
multipart-post (2.4.1)
mutex_m (0.3.0)
nanaimo (0.4.0)
- naturally (2.2.1)
+ naturally (2.3.0)
nkf (0.2.0)
optparse (0.6.0)
os (1.1.4)
- ostruct (0.6.1)
+ ostruct (0.6.2)
plist (3.7.2)
public_suffix (6.0.2)
- rake (13.2.1)
+ rake (13.3.0)
representable (3.2.0)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
diff --git a/macOS/fastlane/Fastfile b/macOS/fastlane/Fastfile
index 0dbfea9..302de2a 100644
--- a/macOS/fastlane/Fastfile
+++ b/macOS/fastlane/Fastfile
@@ -1,3 +1,5 @@
+require_relative "spaceship_patch"
+
default_platform(:mac)
ENV["FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT"] = "120"
diff --git a/macOS/fastlane/spaceship_patch.rb b/macOS/fastlane/spaceship_patch.rb
new file mode 100644
index 0000000..91409f5
--- /dev/null
+++ b/macOS/fastlane/spaceship_patch.rb
@@ -0,0 +1,16 @@
+require "spaceship"
+
+# the ASC API has started (June 2025) throwing a fit when it
+# sees DEVELOPER_ID_APPLICATION_G2 in the certificate types filter.
+# so we patch Spaceship to filter locally instead of via the API.
+# c.f. https://github.com/fastlane/fastlane/pull/29588
+
+class << Spaceship::ConnectAPI::Certificate
+ alias_method :all_orig, :all
+
+ def all(**args)
+ types = args[:filter]&.delete(:certificateType)&.split(",")
+ certs = all_orig(**args)
+ types ? certs.select { |cert| types.include?(cert.certificate_type) } : certs
+ end
+end