From 09a63f6c672dda94be7a313acffd0e8dd4cce87a Mon Sep 17 00:00:00 2001 From: sethkfman Date: Mon, 5 Jun 2023 10:26:41 -0600 Subject: [PATCH 1/7] remove sourcemaps from QA builds --- scripts/build.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index a3ad4e781b5..471dc952f34 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -239,8 +239,6 @@ buildIosReleaseE2E(){ brew install watchman cd ios generateArchivePackages "MetaMask" - # Generate sourcemaps - yarn sourcemaps:ios else echo "Release E2E Build started..." if [ ! -f "ios/release.xcconfig" ] ; then @@ -265,8 +263,6 @@ buildIosQA(){ brew install watchman cd ios generateArchivePackages "MetaMask-QA" - # Generate sourcemaps - yarn sourcemaps:ios else if [ ! -f "ios/release.xcconfig" ] ; then echo "$IOS_ENV" | tr "|" "\n" > ios/release.xcconfig @@ -291,8 +287,6 @@ buildAndroidQA(){ fi if [ "$PRE_RELEASE" = true ] ; then - # Generate sourcemaps - yarn sourcemaps:android # Generate checksum yarn build:android:checksum:qa fi From cd76668e4da20a0495ca3e343b65f85d6d499133 Mon Sep 17 00:00:00 2001 From: sethkfman Date: Tue, 6 Jun 2023 11:30:30 -0600 Subject: [PATCH 2/7] bump ruby version update and recreated podfile.lock --- .ruby-version | 2 +- ios/Podfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ruby-version b/.ruby-version index 4a36342fcab..b5021469305 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.0.0 +3.0.2 diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 37df2961656..332840b91a7 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -777,7 +777,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost: a7c83b31436843459a1961bfd74b96033dc77234 - Branch: 74cc856025984f691833c8fa332834ac38a0cf4e + Branch: 4ac024cb3c29b0ef628048694db3c4cfa679beb0 BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 @@ -874,4 +874,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 74e503a275b4ed097cb01c171027882e9cdc699d -COCOAPODS: 1.12.0 +COCOAPODS: 1.11.3 From 6a2890c9797e5678097d31322715a48dffe5797e Mon Sep 17 00:00:00 2001 From: sethkfman Date: Tue, 6 Jun 2023 11:47:07 -0600 Subject: [PATCH 3/7] bump cocoapods version --- ios/Podfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 332840b91a7..4f2ca475bdf 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -874,4 +874,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 74e503a275b4ed097cb01c171027882e9cdc699d -COCOAPODS: 1.11.3 +COCOAPODS: 1.12.1 From 2ad99e7036ac14cc2fe12df81c315ed9d5fc6160 Mon Sep 17 00:00:00 2001 From: sethkfman Date: Tue, 6 Jun 2023 12:07:40 -0600 Subject: [PATCH 4/7] remove cocoapods caching --- bitrise.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/bitrise.yml b/bitrise.yml index e4d08cfeee0..3cd447002f8 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -600,7 +600,6 @@ workflows: - build_short_version_string: $VERSION_NAME - build_version: $VERSION_NUMBER - plist_path: $PROJECT_LOCATION_IOS/MetaMask/Info.plist - - restore-cocoapods-cache@1: {} - cocoapods-install@2: {} - script@1: inputs: @@ -643,7 +642,6 @@ workflows: - build_short_version_string: $VERSION_NAME - build_version: $VERSION_NUMBER - plist_path: $PROJECT_LOCATION_IOS/MetaMask/MetaMask-QA-Info.plist - - restore-cocoapods-cache@1: {} - cocoapods-install@2: {} - script@1: inputs: From b403fe1b8e98ff6b5b92500d74fad6243543d107 Mon Sep 17 00:00:00 2001 From: sethkfman Date: Tue, 6 Jun 2023 12:36:16 -0600 Subject: [PATCH 5/7] Revert "remove sourcemaps from QA builds" This reverts commit 09a63f6c672dda94be7a313acffd0e8dd4cce87a. --- scripts/build.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/build.sh b/scripts/build.sh index 471dc952f34..a3ad4e781b5 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -239,6 +239,8 @@ buildIosReleaseE2E(){ brew install watchman cd ios generateArchivePackages "MetaMask" + # Generate sourcemaps + yarn sourcemaps:ios else echo "Release E2E Build started..." if [ ! -f "ios/release.xcconfig" ] ; then @@ -263,6 +265,8 @@ buildIosQA(){ brew install watchman cd ios generateArchivePackages "MetaMask-QA" + # Generate sourcemaps + yarn sourcemaps:ios else if [ ! -f "ios/release.xcconfig" ] ; then echo "$IOS_ENV" | tr "|" "\n" > ios/release.xcconfig @@ -287,6 +291,8 @@ buildAndroidQA(){ fi if [ "$PRE_RELEASE" = true ] ; then + # Generate sourcemaps + yarn sourcemaps:android # Generate checksum yarn build:android:checksum:qa fi From 614cd2f6647affd7c12c5188c92e1e3d75688f7b Mon Sep 17 00:00:00 2001 From: sethkfman Date: Tue, 6 Jun 2023 12:36:48 -0600 Subject: [PATCH 6/7] Revert "bump cocoapods version" This reverts commit 6a2890c9797e5678097d31322715a48dffe5797e. --- ios/Podfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 4f2ca475bdf..332840b91a7 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -874,4 +874,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 74e503a275b4ed097cb01c171027882e9cdc699d -COCOAPODS: 1.12.1 +COCOAPODS: 1.11.3 From c3debbc04efd0bcd2adf6425c3f2f12122eefa6b Mon Sep 17 00:00:00 2001 From: sethkfman Date: Tue, 6 Jun 2023 12:37:52 -0600 Subject: [PATCH 7/7] revert podfile.lock changes --- ios/Podfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 332840b91a7..37df2961656 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -777,7 +777,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost: a7c83b31436843459a1961bfd74b96033dc77234 - Branch: 4ac024cb3c29b0ef628048694db3c4cfa679beb0 + Branch: 74cc856025984f691833c8fa332834ac38a0cf4e BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 @@ -874,4 +874,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 74e503a275b4ed097cb01c171027882e9cdc699d -COCOAPODS: 1.11.3 +COCOAPODS: 1.12.0