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

HACK – Publish an XCFramework build for 1.98.1 #5932

Closed
wants to merge 4 commits into from
Closed

HACK – Publish an XCFramework build for 1.98.1 #5932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a266e85
Bump XCFramework deployment target to iOS 15.0
mokagio Jun 28, 2023
cccb023
Use Xcode 14.3.1 in CI, like WordPress iOS does
mokagio Jun 28, 2023
b3fc36f
HACK – Bypass checks to force publishing a build for 1.98.1
mokagio Jul 4, 2023
e239d79
HACK – Replace S3 uploads if there
mokagio Jul 4, 2023
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
2 changes: 1 addition & 1 deletion .buildkite/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,4 @@ steps:
agents:
queue: mac
env:
IMAGE_ID: xcode-14.3
IMAGE_ID: xcode-14.3.1
5 changes: 4 additions & 1 deletion ios-xcframework/Config/Gutenberg-Shared.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,10 @@ INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks
// Code will load on this and later versions of iOS. Framework APIs that are unavailable
// in earlier versions will be weak-linked; your code should check for null function
// pointers or specific system versions before calling newer APIs.
IPHONEOS_DEPLOYMENT_TARGET = 14.0
//
// At the moment, this needs to be the same value as what's used by the consumer (Jetpack and WordPress iOS)
// See https://github.com/wordpress-mobile/WordPress-iOS/commit/eadad98d81c8970144707d8967f8c9f06a6ada38#commitcomment-119894859
IPHONEOS_DEPLOYMENT_TARGET = 15.0
LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks
// Marketing Version
//
Expand Down
2 changes: 1 addition & 1 deletion ios-xcframework/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ gem 'cocoapods', '~> 1.12'
# Let the release-toolkit drive which Fastlane version to use.
# See also https://github.com/wordpress-mobile/release-toolkit/issues/482
gem 'fastlane'
gem 'fastlane-plugin-wpmreleasetoolkit', '~> 8.0'
gem 'fastlane-plugin-wpmreleasetoolkit', git: 'https://github.com/wordpress-mobile/release-toolkit', branch: 'trunk'
47 changes: 26 additions & 21 deletions ios-xcframework/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
GIT
remote: https://github.com/wordpress-mobile/release-toolkit
revision: 4e11a606ea6427253e96d827fe40ced1d371402e
branch: trunk
specs:
fastlane-plugin-wpmreleasetoolkit (8.1.0)
buildkit (~> 1.5)
chroma (= 0.2.0)
diffy (~> 3.3)
fastlane (~> 2.213)
git (~> 1.3)
google-cloud-storage (~> 1.31)
nokogiri (~> 1.11)
octokit (~> 6.1)
parallel (~> 1.14)
plist (~> 3.1)
progress_bar (~> 1.3)
rake (>= 12.3, < 14.0)
rake-compiler (~> 1.0)
xcodeproj (~> 1.22)

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -32,7 +53,6 @@ GEM
aws-sigv4 (1.5.2)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
bigdecimal (1.4.4)
buildkit (1.5.0)
sawyer (>= 0.6)
chroma (0.2.0)
Expand Down Expand Up @@ -120,7 +140,7 @@ GEM
faraday_middleware (1.2.0)
faraday (~> 1.0)
fastimage (2.2.6)
fastlane (2.212.2)
fastlane (2.213.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
Expand All @@ -144,7 +164,7 @@ GEM
json (< 3.0.0)
jwt (>= 2.1.0, < 3)
mini_magick (>= 4.9.4, < 5.0.0)
multipart-post (~> 2.0.0)
multipart-post (>= 2.0.0, < 3.0.0)
naturally (~> 2.2)
optparse (~> 0.1.1)
plist (>= 3.1.0, < 4.0.0)
Expand All @@ -159,21 +179,6 @@ GEM
xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
fastlane-plugin-wpmreleasetoolkit (8.1.0)
activesupport (>= 6.1.7.1)
bigdecimal (~> 1.4)
buildkit (~> 1.5)
chroma (= 0.2.0)
diffy (~> 3.3)
git (~> 1.3)
google-cloud-storage (~> 1.31)
nokogiri (~> 1.11)
octokit (~> 5.6)
parallel (~> 1.14)
plist (~> 3.1)
progress_bar (~> 1.3)
rake (>= 12.3, < 14.0)
rake-compiler (~> 1.0)
ffi (1.15.5)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
Expand Down Expand Up @@ -243,7 +248,7 @@ GEM
nokogiri (1.15.2)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
octokit (5.6.1)
octokit (6.1.1)
faraday (>= 1, < 3)
sawyer (~> 0.9)
options (2.3.2)
Expand All @@ -255,7 +260,7 @@ GEM
highline (>= 1.6, < 3)
options (~> 2.3.0)
public_suffix (4.0.7)
racc (1.6.2)
racc (1.7.1)
rake (13.0.6)
rake-compiler (1.2.3)
rake
Expand Down Expand Up @@ -319,7 +324,7 @@ PLATFORMS
DEPENDENCIES
cocoapods (~> 1.12)
fastlane
fastlane-plugin-wpmreleasetoolkit (~> 8.0)
fastlane-plugin-wpmreleasetoolkit!

BUNDLED WITH
2.3.24
12 changes: 5 additions & 7 deletions ios-xcframework/fastlane/Fastfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ lane :upload_xcframework_to_s3 do

next unless is_ci

tag = ENV.fetch('BUILDKITE_TAG', nil)
# HACK – Bypass checks to force publishing a build for v1.98.1
# tag = ENV.fetch('BUILDKITE_TAG', nil)
tag = 'v1.98.1'

next if tag.nil? || tag.empty?

Expand Down Expand Up @@ -67,16 +69,12 @@ end
# rubocop:enable Metrics/AbcSize
# rubocop:enable Metrics/MethodLength

# Notice skip_if_exists is true by default.
# CI might run on the same commit twice, once for the commit and once for the tag.
# We don't want to fail on the second run.
def upload_to_a8c_s3(file:, name_on_s3:, prefix: 'gutenberg-mobile', skip_if_exists: true)
def upload_to_a8c_s3(file:, name_on_s3:, prefix: 'gutenberg-mobile')
upload_to_s3(
bucket: 'a8c-apps-public-artifacts',
key: "#{prefix}/#{name_on_s3}",
file: file,
auto_prefix: false,
# TODO: Replace with `if_exists: :replace` once the feature is implemented in https://github.com/wordpress-mobile/release-toolkit/pull/495
skip_if_exists: skip_if_exists
if_exists: :replace
)
end