diff --git a/.buildkite/commands/build-for-testing.sh b/.buildkite/commands/build-for-testing.sh index 1f66c9b2e2f0..2fda0beeb241 100755 --- a/.buildkite/commands/build-for-testing.sh +++ b/.buildkite/commands/build-for-testing.sh @@ -12,9 +12,7 @@ if [[ "$APP" != "wordpress" && "$APP" != "jetpack" ]]; then exit 1 fi -echo "--- :beer: Installing Homebrew Dependencies" -brew tap FelixHerrmann/tap -brew install swift-package-list +"$(dirname "${BASH_SOURCE[0]}")/install-swift-package-list.sh" "$(dirname "${BASH_SOURCE[0]}")/shared-set-up.sh" @@ -26,8 +24,8 @@ echo "--- :closed_lock_with_key: Installing Secrets" bundle exec fastlane run configure_apply echo "--- :hammer_and_wrench: Building" -bundle exec fastlane build_${APP}_for_testing +bundle exec fastlane "build_${APP}_for_testing" echo "--- :arrow_up: Upload Build Products" -tar -cf build-products-${APP}.tar DerivedData/Build/Products/ -upload_artifact build-products-${APP}.tar +tar -cf "build-products-${APP}.tar" DerivedData/Build/Products/ +upload_artifact "build-products-${APP}.tar" diff --git a/.buildkite/commands/install-swift-package-list.sh b/.buildkite/commands/install-swift-package-list.sh new file mode 100755 index 000000000000..c88884d1f42e --- /dev/null +++ b/.buildkite/commands/install-swift-package-list.sh @@ -0,0 +1,8 @@ +#!/bin/bash -eu + +echo "--- :beer::swift: Installing swift-package-list via Homebrew" +brew tap FelixHerrmann/tap +if brew help trust >/dev/null 2>&1; then + brew trust FelixHerrmann/tap +fi +brew install swift-package-list diff --git a/.buildkite/commands/shared-set-up-distribution.sh b/.buildkite/commands/shared-set-up-distribution.sh index f81d9639d045..c5062c5f293d 100755 --- a/.buildkite/commands/shared-set-up-distribution.sh +++ b/.buildkite/commands/shared-set-up-distribution.sh @@ -1,11 +1,13 @@ #!/bin/bash -eu +# Homebrew 6 ask-mode prompts before installing dependencies and hangs on the CI PTY. +export HOMEBREW_NO_ASK=1 + echo "--- :beer: Installing Homebrew Dependencies" # Sentry CLI needs to be up-to-date brew upgrade sentry-cli -brew tap FelixHerrmann/tap -brew install swift-package-list +"$(dirname "${BASH_SOURCE[0]}")/install-swift-package-list.sh" brew install imagemagick brew install ghostscript diff --git a/.bundle/config b/.bundle/config index ae257f93d28f..84067808eb46 100644 --- a/.bundle/config +++ b/.bundle/config @@ -3,4 +3,4 @@ BUNDLE_PATH: "vendor/bundle" BUNDLE_JOBS: "3" BUNDLE_WITHOUT: "screenshots" BUNDLE_RETRY: "3" -BUNDLE_SPECIFIC_PLATFORM: "false" +BUNDLE_FORCE_RUBY_PLATFORM: "true" diff --git a/.ruby-version b/.ruby-version index be94e6f53db6..7bcbb3808b50 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2.2 +3.4.9 diff --git a/.xcode-version b/.xcode-version index 3e9e908d3126..7363977a2ac2 100644 --- a/.xcode-version +++ b/.xcode-version @@ -1 +1 @@ -26.4.1 +26.6 diff --git a/Gemfile.lock b/Gemfile.lock index 63e4bab1e096..347a6c843740 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -399,4 +399,4 @@ DEPENDENCIES rubocop-rake (~> 0.7) BUNDLED WITH - 2.4.22 + 4.0.15