diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b8554399b454..940e37965578 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -367,11 +367,11 @@ jobs: # .ci-source-packages can make resolve report success without the # binary artifacts (Sparkle/Sentry) actually present, which then # fails the build. Verify they materialized; if not, clear and retry. - if [ -d "$SOURCE_PACKAGES_DIR/artifacts/sparkle/Sparkle/Sparkle.xcframework" ] && ls -d "$SOURCE_PACKAGES_DIR"/artifacts/sentry-cocoa/*/*.xcframework >/dev/null 2>&1; then + if [ -d "$SOURCE_PACKAGES_DIR/artifacts/sparkle/Sparkle/Sparkle.xcframework" ] && [ -d "$SOURCE_PACKAGES_DIR/artifacts/sentry-cocoa/Sentry/Sentry.xcframework" ]; then exit 0 fi echo "Resolve succeeded but binary artifacts are missing (stale cache); clearing and retrying" >&2 - rm -rf "$SOURCE_PACKAGES_DIR/artifacts" + rm -rf "$SOURCE_PACKAGES_DIR" # whole dir — resolve will not re-materialize artifacts into a partial tree fi if [ "$attempt" -eq 3 ]; then echo "Failed to resolve Swift packages after 3 attempts" >&2 @@ -792,11 +792,11 @@ jobs: # .ci-source-packages can make resolve report success without the # binary artifacts (Sparkle/Sentry) actually present, which then # fails the build. Verify they materialized; if not, clear and retry. - if [ -d "$SOURCE_PACKAGES_DIR/artifacts/sparkle/Sparkle/Sparkle.xcframework" ] && ls -d "$SOURCE_PACKAGES_DIR"/artifacts/sentry-cocoa/*/*.xcframework >/dev/null 2>&1; then + if [ -d "$SOURCE_PACKAGES_DIR/artifacts/sparkle/Sparkle/Sparkle.xcframework" ] && [ -d "$SOURCE_PACKAGES_DIR/artifacts/sentry-cocoa/Sentry/Sentry.xcframework" ]; then exit 0 fi echo "Resolve succeeded but binary artifacts are missing (stale cache); clearing and retrying" >&2 - rm -rf "$SOURCE_PACKAGES_DIR/artifacts" + rm -rf "$SOURCE_PACKAGES_DIR" # whole dir — resolve will not re-materialize artifacts into a partial tree fi if [ "$attempt" -eq 3 ]; then echo "Failed to resolve Swift packages after 3 attempts" >&2 @@ -1288,11 +1288,11 @@ jobs: # .ci-source-packages can make resolve report success without the # binary artifacts (Sparkle/Sentry) actually present, which then # fails the build. Verify they materialized; if not, clear and retry. - if [ -d "$SOURCE_PACKAGES_DIR/artifacts/sparkle/Sparkle/Sparkle.xcframework" ] && ls -d "$SOURCE_PACKAGES_DIR"/artifacts/sentry-cocoa/*/*.xcframework >/dev/null 2>&1; then + if [ -d "$SOURCE_PACKAGES_DIR/artifacts/sparkle/Sparkle/Sparkle.xcframework" ] && [ -d "$SOURCE_PACKAGES_DIR/artifacts/sentry-cocoa/Sentry/Sentry.xcframework" ]; then exit 0 fi echo "Resolve succeeded but binary artifacts are missing (stale cache); clearing and retrying" >&2 - rm -rf "$SOURCE_PACKAGES_DIR/artifacts" + rm -rf "$SOURCE_PACKAGES_DIR" # whole dir — resolve will not re-materialize artifacts into a partial tree fi if [ "$attempt" -eq 3 ]; then echo "Failed to resolve Swift packages after 3 attempts" >&2