Skip to content

Commit

Permalink
Merge pull request #8001 from LedgerHQ/revert-7997-revert-7949-suppor…
Browse files Browse the repository at this point in the history
…t/new-nightly-app-id

Revert reverted "Send nightly iOS builds to new *Ledger Live (nightly)* app in Testflight"

This has passed all tests in a previous test run - these ones failed due to a flaky test that's unrelated.
  • Loading branch information
angusbayley authored Oct 7, 2024
2 parents b7311c4 + b1364f8 commit 664a031
Show file tree
Hide file tree
Showing 19 changed files with 269 additions and 45 deletions.
5 changes: 3 additions & 2 deletions apps/ledger-live-mobile/fastlane/.env.ios.nightly
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
ENVFILE=.env.ios.nightly
APP_IDENTIFIER="com.ledger.live"
MY_APP_BUNDLE_ID="com.ledger.live"
APP_IDENTIFIER="com.ledger.live.nightly"
MY_APP_BUNDLE_ID="com.ledger.live.nightly"
APP_NAME="LL NIGHTLY"
APP_CONFIGURATION="Nightly"
SENTRY_ENVIRONMENT=nightly
SENTRY_PROJECT=llm-ios-nightly
FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT=180
42 changes: 24 additions & 18 deletions apps/ledger-live-mobile/fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,18 @@ platform :ios do
keychain_password: ENV["CI_KEYCHAIN_PASSWORD"],
git_basic_authorization: Base64.strict_encode64("#{ENV["GIT_REPO_USER"]}:#{ENV["GH_TOKEN"]}"),
)
match(
type: "appstore",
app_identifier: "com.ledger.live.nightly",
force: true,
generate_apple_certs: true,
git_url: ENV["GIT_REPO_URL"],
username: ENV["APPLE_ID"],
team_id: ENV["DEVELOPER_TEAM_ID"],
keychain_name: ENV["CI_KEYCHAIN_NAME"],
keychain_password: ENV["CI_KEYCHAIN_PASSWORD"],
git_basic_authorization: Base64.strict_encode64("#{ENV["GIT_REPO_USER"]}:#{ENV["GH_TOKEN"]}"),
)
end

desc "buid for deployment (app-store or ad-hoc)"
Expand All @@ -151,7 +163,10 @@ platform :ios do

build_number = latest_testflight_build_number(
version: trim_version_number(package["version"]),
app_identifier: "com.ledger.live"
# we are moving to using ENV["APP_IDENTIFIER"] but staging + prerelease still override their own
# app identifier to publish to com.ledger.live . This will be removed once we are are fully publishing
# to separate apps
app_identifier: options[:nightly] ? ENV["APP_IDENTIFIER"] : "com.ledger.live"
)

increment_build_number({
Expand Down Expand Up @@ -243,6 +258,9 @@ platform :ios do
gym(
scheme: PROJECT_NAME,
workspace: XCODE_WORKSPACE,
# This should come from env files - as we move each release type to its own app we will
# move them away from "Release" and to their own .env-file defined configuration
configuration: options[:nightly] ? ENV["APP_CONFIGURATION"] : "Release",
silent: true,
xcargs: `#{settings_to_override} -UseNewBuildSystem=YES`,
output_directory: OUTPUT_DIRECTORY,
Expand Down Expand Up @@ -279,9 +297,8 @@ platform :ios do
begin
pilot(
skip_submission: false,
app_identifier: "com.ledger.live",
app_identifier: ENV["APP_IDENTIFIER"],
skip_waiting_for_build_processing: true,
# wait_processing_timeout_duration: 1800, # 30mn
ipa: IPA_DIRECTORY,
changelog: "Nightly Build v#{package['version']} (#{build_number})",
beta_app_review_info: {
Expand All @@ -290,20 +307,6 @@ platform :ios do
notes: "test nightly builds"
}
)

# pilot(
# distribute_only: true,
# groups: ["External Nightly"],
# distribute_external: true,
# app_identifier: "com.ledger.live",
# app_platform: 'ios',
# app_version: package["version"],
# build_number: get_build_number(xcodeproj: "ios/ledgerlivemobile.xcodeproj"),
# notify_external_testers: true,
# reject_build_waiting_for_review: !options[:ci],
# skip_waiting_for_build_processing: false,
# wait_processing_timeout_duration: 1800, # 30mn
# )
rescue => e
raise unless e.message.include? "Another build is in review"

Expand Down Expand Up @@ -341,7 +344,10 @@ platform :ios do
desc "ci: create nightly version"
lane :ci_nightly do |options|
setup_ios_ci
build(ci: true)
build(
nightly: true,
ci: true
)
upload(
nightly: true,
ci: true
Expand Down
145 changes: 123 additions & 22 deletions apps/ledger-live-mobile/ios/ledgerlivemobile.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -815,14 +815,8 @@
);
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
"$(inherited)",
" ",
);
OTHER_CPLUSPLUSFLAGS = (
"$(inherited)",
" ",
);
OTHER_CFLAGS = "$(inherited) ";
OTHER_CPLUSPLUSFLAGS = "$(inherited) ";
OTHER_LDFLAGS = "$(inherited)";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
Expand Down Expand Up @@ -943,14 +937,8 @@
);
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
"$(inherited)",
" ",
);
OTHER_CPLUSPLUSFLAGS = (
"$(inherited)",
" ",
);
OTHER_CFLAGS = "$(inherited) ";
OTHER_CPLUSPLUSFLAGS = "$(inherited) ";
OTHER_LDFLAGS = "$(inherited)";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
Expand Down Expand Up @@ -1015,14 +1003,76 @@
"\"$(inherited)\"",
);
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_CFLAGS = (
OTHER_CFLAGS = "$(inherited) ";
OTHER_CPLUSPLUSFLAGS = "$(inherited) ";
OTHER_LDFLAGS = "$(inherited)";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_VERSION = 5.0;
USE_HERMES = true;
VALIDATE_PRODUCT = YES;
};
name = Release;
};
BB0B80012CAAB47600AF2B0C /* Nightly */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
DEVELOPMENT_TEAM = 5HK2Q4J4X4;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
" ",
_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION,
);
OTHER_CPLUSPLUSFLAGS = (
"$(inherited)",
" ",
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
INFOPLIST_PREPROCESS = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
LIBRARY_SEARCH_PATHS = (
"$(SDKROOT)/usr/lib/swift",
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
"\"$(inherited)\"",
);
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_CFLAGS = "$(inherited) ";
OTHER_CPLUSPLUSFLAGS = "$(inherited) ";
OTHER_LDFLAGS = "$(inherited)";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
Expand All @@ -1031,7 +1081,56 @@
USE_HERMES = true;
VALIDATE_PRODUCT = YES;
};
name = Release;
name = Nightly;
};
BB0B80022CAAB47600AF2B0C /* Nightly */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = F77638C1F4BC132FB97FEEAF /* Pods-ledgerlivemobile.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = NightlyAppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = ledgerlivemobile/ledgerlivemobile.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 381;
DEVELOPMENT_TEAM = X6LFS5BQKN;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(PROJECT_DIR)",
"$(PROJECT_DIR)/ledgerlivemobile",
"$(SRCROOT)",
"$(inherited)",
);
HEADER_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = ledgerlivemobile/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
/usr/lib/swift,
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = (
"$(SDKROOT)/usr/lib/swift",
"$(inherited)",
);
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
"-lc++",
);
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = com.ledger.live.nightly;
PRODUCT_NAME = ledgerlivemobile;
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "ledgerlivemobile-Bridging-Header.h";
SWIFT_VERSION = 5.0;
VALID_ARCHS = "$(ARCHS_STANDARD)";
VERSIONING_SYSTEM = "apple-generic";
};
name = Nightly;
};
/* End XCBuildConfiguration section */

Expand All @@ -1041,6 +1140,7 @@
buildConfigurations = (
13B07F941A680F5B00A75B9A /* Debug */,
13B07F951A680F5B00A75B9A /* Release */,
BB0B80022CAAB47600AF2B0C /* Nightly */,
76138D0A243CBC8E00264435 /* Staging */,
);
defaultConfigurationIsVisible = 0;
Expand All @@ -1051,6 +1151,7 @@
buildConfigurations = (
83CBBA201A601CBA00E9B192 /* Debug */,
83CBBA211A601CBA00E9B192 /* Release */,
BB0B80012CAAB47600AF2B0C /* Nightly */,
76138D09243CBC8E00264435 /* Staging */,
);
defaultConfigurationIsVisible = 0;
Expand Down
Loading

0 comments on commit 664a031

Please sign in to comment.