From bf9facd2b2056fabaa4a4011983ffdb029fd7956 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 17 Jul 2024 09:04:35 +1000 Subject: [PATCH 01/12] Switch to SSH to fetch WordPress.rs --- Modules/Package.swift | 4 +++- WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Modules/Package.swift b/Modules/Package.swift index d46636b9e04a..4c582528bd16 100644 --- a/Modules/Package.swift +++ b/Modules/Package.swift @@ -43,7 +43,9 @@ let package = Package( .package(url: "https://github.com/wordpress-mobile/WordPressUI-iOS", branch: "kean-patch-1"), .package(url: "https://github.com/wordpress-mobile/wpxmlrpc", from: "0.10.0"), .package(url: "https://github.com/zendesk/support_sdk_ios", from: "8.0.3"), - .package(url: "https://github.com/Automattic/wordpress-rs", from: "0.1.0"), + // This is currently a private repo. + // Fetching it via SSH to avoid HTTPS auth prompts in CI. + .package(url: "git@github.com:Automattic/wordpress-rs", from: "0.1.0"), ], targets: XcodeSupport.targets + [ .target(name: "JetpackStatsWidgetsCore"), diff --git a/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved b/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved index ed0219122339..6437d491c014 100644 --- a/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -435,7 +435,7 @@ }, { "package": "WordPress", - "repositoryURL": "https://github.com/Automattic/wordpress-rs", + "repositoryURL": "git@github.com:Automattic/wordpress-rs", "state": { "branch": null, "revision": "6394b30b34ed6bf204be8de5558ba2c73d2a10e3", From d6ae5e2af471f3193eed1cd863a074a18e29086d Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 17 Jul 2024 09:27:52 +1000 Subject: [PATCH 02/12] Set up private repo fetching in WP Prototype Build CI step --- .buildkite/commands/prototype-build-wordpress.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.buildkite/commands/prototype-build-wordpress.sh b/.buildkite/commands/prototype-build-wordpress.sh index a992345037a0..2725714b8849 100644 --- a/.buildkite/commands/prototype-build-wordpress.sh +++ b/.buildkite/commands/prototype-build-wordpress.sh @@ -1,5 +1,16 @@ #!/bin/bash -eu +echo "--- :git: Change Git SSH key to fetch private dependencies" + +PRIVATE_REPO_FETCH_KEY_NAME="private_repos_key" +add_ssh_key_to_agent "$PRIVATE_REPOS_BOT_KEY" "$PRIVATE_REPO_FETCH_KEY_NAME" +PRIVATE_REPO_FETCH_KEY="$HOME/.ssh/$PRIVATE_REPO_FETCH_KEY_NAME" + +add_host_to_ssh_known_hosts 'github.com' + +export GIT_SSH_COMMAND="ssh -i $PRIVATE_REPO_FETCH_KEY -o IdentitiesOnly=yes" +echo "Git SSH command is now $GIT_SSH_COMMAND" + # Sentry CLI needs to be up-to-date brew upgrade sentry-cli From b76d75f53dd25a9a65f9986f8565edc5b1707acb Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 17 Jul 2024 11:36:33 +1000 Subject: [PATCH 03/12] Extract steps to configure Git in CI and use in all builds --- .buildkite/commands/build-for-testing.sh | 2 ++ .buildkite/commands/prototype-build-jetpack.sh | 2 ++ .buildkite/commands/prototype-build-wordpress.sh | 11 +---------- .buildkite/commands/release-build-jetpack.sh | 2 ++ .buildkite/commands/release-build-wordpress.sh | 2 ++ .buildkite/commands/set-up-git-for-private-repos.sh | 12 ++++++++++++ 6 files changed, 21 insertions(+), 10 deletions(-) create mode 100755 .buildkite/commands/set-up-git-for-private-repos.sh diff --git a/.buildkite/commands/build-for-testing.sh b/.buildkite/commands/build-for-testing.sh index e89cc4743185..6e4e489be505 100755 --- a/.buildkite/commands/build-for-testing.sh +++ b/.buildkite/commands/build-for-testing.sh @@ -7,6 +7,8 @@ if [[ "$APP" != "wordpress" && "$APP" != "jetpack" ]]; then exit 1 fi +"$(dirname "${BASH_SOURCE[0]}")/set-up-git-for-private-repos.sh" + echo "--- :rubygems: Setting up Gems" install_gems diff --git a/.buildkite/commands/prototype-build-jetpack.sh b/.buildkite/commands/prototype-build-jetpack.sh index 8d08672b68f1..21c8b7538f5b 100644 --- a/.buildkite/commands/prototype-build-jetpack.sh +++ b/.buildkite/commands/prototype-build-jetpack.sh @@ -1,5 +1,7 @@ #!/bin/bash -eu +"$(dirname "${BASH_SOURCE[0]}")/set-up-git-for-private-repos.sh" + # Sentry CLI needs to be up-to-date brew upgrade sentry-cli diff --git a/.buildkite/commands/prototype-build-wordpress.sh b/.buildkite/commands/prototype-build-wordpress.sh index 2725714b8849..f37b2e4b3135 100644 --- a/.buildkite/commands/prototype-build-wordpress.sh +++ b/.buildkite/commands/prototype-build-wordpress.sh @@ -1,15 +1,6 @@ #!/bin/bash -eu -echo "--- :git: Change Git SSH key to fetch private dependencies" - -PRIVATE_REPO_FETCH_KEY_NAME="private_repos_key" -add_ssh_key_to_agent "$PRIVATE_REPOS_BOT_KEY" "$PRIVATE_REPO_FETCH_KEY_NAME" -PRIVATE_REPO_FETCH_KEY="$HOME/.ssh/$PRIVATE_REPO_FETCH_KEY_NAME" - -add_host_to_ssh_known_hosts 'github.com' - -export GIT_SSH_COMMAND="ssh -i $PRIVATE_REPO_FETCH_KEY -o IdentitiesOnly=yes" -echo "Git SSH command is now $GIT_SSH_COMMAND" +"$(dirname "${BASH_SOURCE[0]}")/set-up-git-for-private-repos.sh" # Sentry CLI needs to be up-to-date brew upgrade sentry-cli diff --git a/.buildkite/commands/release-build-jetpack.sh b/.buildkite/commands/release-build-jetpack.sh index e16f347b9f39..4eef398fad49 100755 --- a/.buildkite/commands/release-build-jetpack.sh +++ b/.buildkite/commands/release-build-jetpack.sh @@ -1,5 +1,7 @@ #!/bin/bash -eu +"$(dirname "${BASH_SOURCE[0]}")/set-up-git-for-private-repos.sh" + brew install imagemagick brew install ghostscript # Sentry CLI needs to be up-to-date diff --git a/.buildkite/commands/release-build-wordpress.sh b/.buildkite/commands/release-build-wordpress.sh index 4ffdde14029b..d464279edecb 100755 --- a/.buildkite/commands/release-build-wordpress.sh +++ b/.buildkite/commands/release-build-wordpress.sh @@ -1,5 +1,7 @@ #!/bin/bash -eu +"$(dirname "${BASH_SOURCE[0]}")/set-up-git-for-private-repos.sh" + echo "--- :arrow_down: Installing Release Dependencies" brew install imagemagick brew install ghostscript diff --git a/.buildkite/commands/set-up-git-for-private-repos.sh b/.buildkite/commands/set-up-git-for-private-repos.sh new file mode 100755 index 000000000000..0465e2d5fa69 --- /dev/null +++ b/.buildkite/commands/set-up-git-for-private-repos.sh @@ -0,0 +1,12 @@ +#!/bin/bash -eu + +echo "--- :git: Change Git SSH key to fetch private dependencies" + +PRIVATE_REPO_FETCH_KEY_NAME="private_repos_key" +add_ssh_key_to_agent "$PRIVATE_REPOS_BOT_KEY" "$PRIVATE_REPO_FETCH_KEY_NAME" +PRIVATE_REPO_FETCH_KEY="$HOME/.ssh/$PRIVATE_REPO_FETCH_KEY_NAME" + +add_host_to_ssh_known_hosts 'github.com' + +export GIT_SSH_COMMAND="ssh -i $PRIVATE_REPO_FETCH_KEY -o IdentitiesOnly=yes" +echo "Git SSH command is now $GIT_SSH_COMMAND" From 67585cd80f8b20e9e913d2f0fe93f7279a91cf30 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 17 Jul 2024 12:03:42 +1000 Subject: [PATCH 04/12] Try to make `gym` use system SCM... --- fastlane/Fastfile | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index d7d2b8a8f4e6..65de965d948e 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -275,6 +275,17 @@ before_all do |lane| # See also https://github.com/fastlane/fastlane/issues/20919 ENV['FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT'] = '120' + # Experiment! + # + # Despite us configuring Git to fetch private repos, and it working + # see https://buildkite.com/automattic/wordpress-ios/builds/23081#0190be63-d1dd-4940-9576-3569df1452d7/352-742 + # Gym fails to find WordPress-rs, see + # https://buildkite.com/automattic/wordpress-ios/builds/23081#0190be63-d1dd-4940-9576-3569df1452d7/945-1016 + # + # Could it be because xcodebuild uses a different Git configuration? + ENV['GYM_USE_SYSTEM_SCM'] = 'true' + # TODO: Given our CI manages the SPM cache, we might want to bypass SPM resolution entirely + # Skip these checks/steps for test lane (not needed for testing) next if lane == :test_without_building From 5271617e01007cee451bb0eb898dc18bf6972e8e Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 17 Jul 2024 12:17:14 +1000 Subject: [PATCH 05/12] Try to bypass dependencies resolution in `gym` altogether --- fastlane/Fastfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 65de965d948e..ebe0a16e3cd2 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -284,7 +284,13 @@ before_all do |lane| # # Could it be because xcodebuild uses a different Git configuration? ENV['GYM_USE_SYSTEM_SCM'] = 'true' - # TODO: Given our CI manages the SPM cache, we might want to bypass SPM resolution entirely + # + # Update 1: + # The setting above is applied, but does not solve the problem. + # See https://buildkite.com/automattic/wordpress-ios/builds/23082#0190be6e-df9f-4515-a4b5-1be43b4b2f3d/944-951 + # + # Try bypassing SPM entirely + ENV['GYM_SKIP_PACKAGE_DEPENDENCIES_RESOLUTION'] = 'true' # Skip these checks/steps for test lane (not needed for testing) next if lane == :test_without_building From 7867dfa6f672760a0346fd45d65a27ed96e6b38e Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 17 Jul 2024 12:27:30 +1000 Subject: [PATCH 06/12] Source set up script because of the `export` call it makes --- .buildkite/commands/build-for-testing.sh | 2 +- .buildkite/commands/prototype-build-jetpack.sh | 2 +- .buildkite/commands/prototype-build-wordpress.sh | 2 +- .buildkite/commands/release-build-jetpack.sh | 2 +- .buildkite/commands/release-build-wordpress.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.buildkite/commands/build-for-testing.sh b/.buildkite/commands/build-for-testing.sh index 6e4e489be505..e5da23f19f01 100755 --- a/.buildkite/commands/build-for-testing.sh +++ b/.buildkite/commands/build-for-testing.sh @@ -7,7 +7,7 @@ if [[ "$APP" != "wordpress" && "$APP" != "jetpack" ]]; then exit 1 fi -"$(dirname "${BASH_SOURCE[0]}")/set-up-git-for-private-repos.sh" +source "$(dirname "${BASH_SOURCE[0]}")/set-up-git-for-private-repos.sh" echo "--- :rubygems: Setting up Gems" install_gems diff --git a/.buildkite/commands/prototype-build-jetpack.sh b/.buildkite/commands/prototype-build-jetpack.sh index 21c8b7538f5b..1981048667bb 100644 --- a/.buildkite/commands/prototype-build-jetpack.sh +++ b/.buildkite/commands/prototype-build-jetpack.sh @@ -1,6 +1,6 @@ #!/bin/bash -eu -"$(dirname "${BASH_SOURCE[0]}")/set-up-git-for-private-repos.sh" +source "$(dirname "${BASH_SOURCE[0]}")/set-up-git-for-private-repos.sh" # Sentry CLI needs to be up-to-date brew upgrade sentry-cli diff --git a/.buildkite/commands/prototype-build-wordpress.sh b/.buildkite/commands/prototype-build-wordpress.sh index f37b2e4b3135..870cd96b7414 100644 --- a/.buildkite/commands/prototype-build-wordpress.sh +++ b/.buildkite/commands/prototype-build-wordpress.sh @@ -1,6 +1,6 @@ #!/bin/bash -eu -"$(dirname "${BASH_SOURCE[0]}")/set-up-git-for-private-repos.sh" +source "$(dirname "${BASH_SOURCE[0]}")/set-up-git-for-private-repos.sh" # Sentry CLI needs to be up-to-date brew upgrade sentry-cli diff --git a/.buildkite/commands/release-build-jetpack.sh b/.buildkite/commands/release-build-jetpack.sh index 4eef398fad49..65332099aab2 100755 --- a/.buildkite/commands/release-build-jetpack.sh +++ b/.buildkite/commands/release-build-jetpack.sh @@ -1,6 +1,6 @@ #!/bin/bash -eu -"$(dirname "${BASH_SOURCE[0]}")/set-up-git-for-private-repos.sh" +source "$(dirname "${BASH_SOURCE[0]}")/set-up-git-for-private-repos.sh" brew install imagemagick brew install ghostscript diff --git a/.buildkite/commands/release-build-wordpress.sh b/.buildkite/commands/release-build-wordpress.sh index d464279edecb..95a75bcd1eca 100755 --- a/.buildkite/commands/release-build-wordpress.sh +++ b/.buildkite/commands/release-build-wordpress.sh @@ -1,6 +1,6 @@ #!/bin/bash -eu -"$(dirname "${BASH_SOURCE[0]}")/set-up-git-for-private-repos.sh" +source "$(dirname "${BASH_SOURCE[0]}")/set-up-git-for-private-repos.sh" echo "--- :arrow_down: Installing Release Dependencies" brew install imagemagick From 2e4d086b10cbcfe5f980e499fb206004bcb56eb1 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 17 Jul 2024 13:50:39 +1000 Subject: [PATCH 07/12] Ensure `set-up-git-for-private-repos.sh` is sourced, not run --- .buildkite/commands/build-for-testing.sh | 1 + .buildkite/commands/prototype-build-jetpack.sh | 1 + .buildkite/commands/prototype-build-wordpress.sh | 1 + .buildkite/commands/release-build-jetpack.sh | 1 + .buildkite/commands/release-build-wordpress.sh | 1 + .buildkite/commands/set-up-git-for-private-repos.sh | 5 +++++ 6 files changed, 10 insertions(+) diff --git a/.buildkite/commands/build-for-testing.sh b/.buildkite/commands/build-for-testing.sh index e5da23f19f01..d15d67f2ba84 100755 --- a/.buildkite/commands/build-for-testing.sh +++ b/.buildkite/commands/build-for-testing.sh @@ -7,6 +7,7 @@ if [[ "$APP" != "wordpress" && "$APP" != "jetpack" ]]; then exit 1 fi +# shellcheck disable=SC1091 source "$(dirname "${BASH_SOURCE[0]}")/set-up-git-for-private-repos.sh" echo "--- :rubygems: Setting up Gems" diff --git a/.buildkite/commands/prototype-build-jetpack.sh b/.buildkite/commands/prototype-build-jetpack.sh index 1981048667bb..087f0d8e7654 100644 --- a/.buildkite/commands/prototype-build-jetpack.sh +++ b/.buildkite/commands/prototype-build-jetpack.sh @@ -1,5 +1,6 @@ #!/bin/bash -eu +# shellcheck disable=SC1091 source "$(dirname "${BASH_SOURCE[0]}")/set-up-git-for-private-repos.sh" # Sentry CLI needs to be up-to-date diff --git a/.buildkite/commands/prototype-build-wordpress.sh b/.buildkite/commands/prototype-build-wordpress.sh index 870cd96b7414..2e043cc1e4a4 100644 --- a/.buildkite/commands/prototype-build-wordpress.sh +++ b/.buildkite/commands/prototype-build-wordpress.sh @@ -1,5 +1,6 @@ #!/bin/bash -eu +# shellcheck disable=SC1091 source "$(dirname "${BASH_SOURCE[0]}")/set-up-git-for-private-repos.sh" # Sentry CLI needs to be up-to-date diff --git a/.buildkite/commands/release-build-jetpack.sh b/.buildkite/commands/release-build-jetpack.sh index 65332099aab2..7fa5a07e5cb1 100755 --- a/.buildkite/commands/release-build-jetpack.sh +++ b/.buildkite/commands/release-build-jetpack.sh @@ -1,5 +1,6 @@ #!/bin/bash -eu +# shellcheck disable=SC1091 source "$(dirname "${BASH_SOURCE[0]}")/set-up-git-for-private-repos.sh" brew install imagemagick diff --git a/.buildkite/commands/release-build-wordpress.sh b/.buildkite/commands/release-build-wordpress.sh index 95a75bcd1eca..e015f2c1c63e 100755 --- a/.buildkite/commands/release-build-wordpress.sh +++ b/.buildkite/commands/release-build-wordpress.sh @@ -1,5 +1,6 @@ #!/bin/bash -eu +# shellcheck disable=SC1091 source "$(dirname "${BASH_SOURCE[0]}")/set-up-git-for-private-repos.sh" echo "--- :arrow_down: Installing Release Dependencies" diff --git a/.buildkite/commands/set-up-git-for-private-repos.sh b/.buildkite/commands/set-up-git-for-private-repos.sh index 0465e2d5fa69..d61d0e3b6c1d 100755 --- a/.buildkite/commands/set-up-git-for-private-repos.sh +++ b/.buildkite/commands/set-up-git-for-private-repos.sh @@ -1,5 +1,10 @@ #!/bin/bash -eu +if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then + echo "This script must be sourced, not executed, because it exports GIT_SSH_COMMAND." + exit 1 +fi + echo "--- :git: Change Git SSH key to fetch private dependencies" PRIVATE_REPO_FETCH_KEY_NAME="private_repos_key" From 2f9db71daab5a6136b3d1270fa77a16fabfe6d5f Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 17 Jul 2024 13:51:31 +1000 Subject: [PATCH 08/12] Revert "Try to bypass dependencies resolution in `gym` altogether" This reverts commit 5271617e01007cee451bb0eb898dc18bf6972e8e. --- fastlane/Fastfile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index ebe0a16e3cd2..65de965d948e 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -284,13 +284,7 @@ before_all do |lane| # # Could it be because xcodebuild uses a different Git configuration? ENV['GYM_USE_SYSTEM_SCM'] = 'true' - # - # Update 1: - # The setting above is applied, but does not solve the problem. - # See https://buildkite.com/automattic/wordpress-ios/builds/23082#0190be6e-df9f-4515-a4b5-1be43b4b2f3d/944-951 - # - # Try bypassing SPM entirely - ENV['GYM_SKIP_PACKAGE_DEPENDENCIES_RESOLUTION'] = 'true' + # TODO: Given our CI manages the SPM cache, we might want to bypass SPM resolution entirely # Skip these checks/steps for test lane (not needed for testing) next if lane == :test_without_building From bc94d9f06463eac6171b201ceefb307bc2284136 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 17 Jul 2024 13:51:39 +1000 Subject: [PATCH 09/12] Revert "Try to make `gym` use system SCM..." This reverts commit 67585cd80f8b20e9e913d2f0fe93f7279a91cf30. --- fastlane/Fastfile | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 65de965d948e..d7d2b8a8f4e6 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -275,17 +275,6 @@ before_all do |lane| # See also https://github.com/fastlane/fastlane/issues/20919 ENV['FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT'] = '120' - # Experiment! - # - # Despite us configuring Git to fetch private repos, and it working - # see https://buildkite.com/automattic/wordpress-ios/builds/23081#0190be63-d1dd-4940-9576-3569df1452d7/352-742 - # Gym fails to find WordPress-rs, see - # https://buildkite.com/automattic/wordpress-ios/builds/23081#0190be63-d1dd-4940-9576-3569df1452d7/945-1016 - # - # Could it be because xcodebuild uses a different Git configuration? - ENV['GYM_USE_SYSTEM_SCM'] = 'true' - # TODO: Given our CI manages the SPM cache, we might want to bypass SPM resolution entirely - # Skip these checks/steps for test lane (not needed for testing) next if lane == :test_without_building From 52d7fa11f4ac04aab204bf371bf7aeb48b42af2c Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 17 Jul 2024 13:58:26 +1000 Subject: [PATCH 10/12] Remove trailing whitespaces from a couple of files (SwiftLint) See build annotation in https://buildkite.com/automattic/wordpress-ios/builds/23085 --- WordPress/Classes/Networking/LoginClient.swift | 2 +- WordPress/Classes/Utility/Analytics/WPAnalyticsEvent.swift | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WordPress/Classes/Networking/LoginClient.swift b/WordPress/Classes/Networking/LoginClient.swift index 30992968413d..6a0d8fb04d13 100644 --- a/WordPress/Classes/Networking/LoginClient.swift +++ b/WordPress/Classes/Networking/LoginClient.swift @@ -3,7 +3,7 @@ import WordPressAPI import AutomatticTracks actor LoginClient { - + struct ApiDetails { let rootUrl: ParsedUrl let loginUrl: String? diff --git a/WordPress/Classes/Utility/Analytics/WPAnalyticsEvent.swift b/WordPress/Classes/Utility/Analytics/WPAnalyticsEvent.swift index 4d5d5dafca1b..e07695b9545a 100644 --- a/WordPress/Classes/Utility/Analytics/WPAnalyticsEvent.swift +++ b/WordPress/Classes/Utility/Analytics/WPAnalyticsEvent.swift @@ -682,7 +682,7 @@ import Foundation case .gutenbergEditorHelpShown: "editor_help_shown" case .gutenbergEditorBlockInserted: "editor_block_inserted" case .gutenbergEditorBlockMoved: "editor_block_moved" - + // Notifications permissions case .pushNotificationsPrimerSeen: "notifications_primer_seen" case .pushNotificationsPrimerAllowTapped: "notifications_primer_allow_tapped" @@ -690,7 +690,7 @@ import Foundation case .secondNotificationsAlertSeen: "notifications_second_alert_seen" case .secondNotificationsAlertAllowTapped: "notifications_second_alert_allow_tapped" case .secondNotificationsAlertNoTapped: "notifications_second_alert_no_tapped" - + // Reader case .selectInterestsShown: "select_interests_shown" case .selectInterestsPicked: "select_interests_picked" From c370ed9a4dfeee1210c59a6b0d352a9b9267fe3b Mon Sep 17 00:00:00 2001 From: Jeremy Massel <1123407+jkmassel@users.noreply.github.com> Date: Wed, 17 Jul 2024 12:29:25 -0600 Subject: [PATCH 11/12] Update .buildkite/commands/set-up-git-for-private-repos.sh Co-authored-by: Olivier Halligon --- .buildkite/commands/set-up-git-for-private-repos.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.buildkite/commands/set-up-git-for-private-repos.sh b/.buildkite/commands/set-up-git-for-private-repos.sh index d61d0e3b6c1d..55abe7a7c849 100755 --- a/.buildkite/commands/set-up-git-for-private-repos.sh +++ b/.buildkite/commands/set-up-git-for-private-repos.sh @@ -8,6 +8,7 @@ fi echo "--- :git: Change Git SSH key to fetch private dependencies" PRIVATE_REPO_FETCH_KEY_NAME="private_repos_key" +// $PRIVATE_REPOS_BOT_KEY is declared in the `env` file of this pipeline in `mobile-secrets` add_ssh_key_to_agent "$PRIVATE_REPOS_BOT_KEY" "$PRIVATE_REPO_FETCH_KEY_NAME" PRIVATE_REPO_FETCH_KEY="$HOME/.ssh/$PRIVATE_REPO_FETCH_KEY_NAME" From c895955b1124b5dce7a0004f8ba437f9743b2f96 Mon Sep 17 00:00:00 2001 From: Jeremy Massel <1123407+jkmassel@users.noreply.github.com> Date: Wed, 17 Jul 2024 12:31:38 -0600 Subject: [PATCH 12/12] Fix comment character --- .buildkite/commands/set-up-git-for-private-repos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/commands/set-up-git-for-private-repos.sh b/.buildkite/commands/set-up-git-for-private-repos.sh index 55abe7a7c849..0bda132afda6 100755 --- a/.buildkite/commands/set-up-git-for-private-repos.sh +++ b/.buildkite/commands/set-up-git-for-private-repos.sh @@ -8,7 +8,7 @@ fi echo "--- :git: Change Git SSH key to fetch private dependencies" PRIVATE_REPO_FETCH_KEY_NAME="private_repos_key" -// $PRIVATE_REPOS_BOT_KEY is declared in the `env` file of this pipeline in `mobile-secrets` +# $PRIVATE_REPOS_BOT_KEY is declared in the `env` file of this pipeline in `mobile-secrets` add_ssh_key_to_agent "$PRIVATE_REPOS_BOT_KEY" "$PRIVATE_REPO_FETCH_KEY_NAME" PRIVATE_REPO_FETCH_KEY="$HOME/.ssh/$PRIVATE_REPO_FETCH_KEY_NAME"