diff --git a/.github/workflows/sdk.core.yml b/.github/workflows/sdk.core.yml index 479690f4814..d1dd8852b32 100644 --- a/.github/workflows/sdk.core.yml +++ b/.github/workflows/sdk.core.yml @@ -13,7 +13,7 @@ on: - '.github/workflows/_cocoapods.yml' - '.github/workflows/_catalyst.yml' - '.github/workflows/_cocoapods.cron.yml' - - 'scripts/' # Smoke test changes in `scripts/`. + - 'scripts/**' # Smoke test changes in `scripts/`. - 'Gemfile*' schedule: # Run every day at 3am (PDT) / 6am (EDT) - cron uses UTC times diff --git a/scripts/test_catalyst.sh b/scripts/test_catalyst.sh index edfae6cc151..f327e3e7c45 100755 --- a/scripts/test_catalyst.sh +++ b/scripts/test_catalyst.sh @@ -37,6 +37,9 @@ else scheme="$pod" fi +# Define timestamp before args array +timestamp=$(date +%s) + bundle exec pod gen --local-sources=./ --sources=https://github.com/firebase/SpecsDev.git,https://github.com/firebase/SpecsStaging.git,https://cdn.cocoapods.org/ \ "$pod".podspec --platforms=ios @@ -57,10 +60,10 @@ args=( "CODE_SIGN_IDENTITY=-" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO" # GHA is still running 10.15. "MACOSX_DEPLOYMENT_TARGET=10.15" - "-resultBundlePath" "xcresults/$scheme.xcresult" + "-resultBundlePath" "xcresults/$scheme-${timestamp}.xcresult" ) xcodebuild -version gem install xcpretty -log_filename="xcodebuild-${build_mode}.log" +log_filename="xcodebuild-${build_mode}-${timestamp}.log" xcodebuild "${args[@]}" | tee "$log_filename" | xcpretty