Skip to content

Conversation

@andriydruk
Copy link
Member

@andriydruk andriydruk commented Jun 28, 2025

Note

Upgrade to Swift 6.2 with Swiftly-based bootstrap, refresh build dependencies, adjust Android presets, and remove several custom patches.

  • Build/Toolchain:
    • Upgrade Swift to 6.2 and update build/version to 6.2-r1.
    • Replace release tarball bootstrap with swiftly (install/use 6.2-snapshot; export SWIFT_PATH).
    • Refresh Ubuntu package list in build/000-install-dependencies-nobel.sh and add jq for Swiftly.
  • Android presets:
    • Replace patches/swift/0001-Add-presets-for-android-x86-x86_64.patch with patches/swift/0001-Add-presets-for-android-x86.patch (adds x86 preset; x86_64 handled upstream).
  • Patches cleanup:
    • Remove custom patches:
      • patches/swift-corelibs-foundation/0011-fix-parsing-tzdata-version-2-plus.patch
      • patches/swift-corelibs-foundation/0014-add-swift-syntax-source-dir-variable.patch
      • patches/swift-corelibs-foundation/0015-add-empty-CFPosixSpawnFileActionsChdir-for-android.patch
      • patches/swift-foundation/0001-open-range-attributed-string-from-nsrange.patch
      • patches/swift-syntax/0001-replace-bionic-with-android.patch

Written by Cursor Bugbot for commit 8f0d496. This will update automatically on new commits. Configure here.

cursor[bot]

This comment was marked as outdated.

cursor[bot]

This comment was marked as outdated.

cursor[bot]

This comment was marked as outdated.

cursor[bot]

This comment was marked as outdated.

cursor[bot]

This comment was marked as outdated.

cursor[bot]

This comment was marked as outdated.

cursor[bot]

This comment was marked as outdated.

cursor[bot]

This comment was marked as outdated.

Copy link

@cursor cursor bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bug: Clang Snapshot Path Mismatch

The script hardcodes a specific snapshot date in the toolchain path for accessing clang. This conflicts with swiftly install 6.2-snapshot, which installs the latest available snapshot with a dynamic date. Consequently, the hardcoded directory does not exist, causing the pushd command and clang version check to fail. The toolchain name should be dynamically determined, consistent with SWIFT_PATH export.

build/020-clone-swift.sh#L55-L61

swiftly install 6.2-snapshot
swiftly use 6.2-snapshot
pushd .local/share/swiftly/toolchains/6.2-snapshot-2025-07-04/usr/bin/
./clang --version
popd

Fix in CursorFix in Web


Was this report helpful? Give feedback by reacting with 👍 or 👎

Copy link

@readdle-gitleaks readdle-gitleaks bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Warning

🕵️ Potential Secrets Leak Detected!

1 security issue(s) found.

Gitleaks scan detected potential secrets or sensitive data in your code.
This may violate our Security Code Requirements Policy and raise serious security risks.

Please review and fix these findings before merging this pull request.

Tip

If you are confident that a finding is a false positive (e.g., related to test data or non-sensitive sample values) consider Ignoring but do that with an extreme caution only after reliable review and verification.
You can use provided suppression line to put into .gitleaksignore or use #gitleaks: accept comment in code. Please add comments to explain finding suppression to make this decision clear.


📄 Dockerfile

📍 Location: Line 52 / Commit: e0cfa1c
Issue: Detected a Generic API Key, potentially exposing access to various services and sensitive operations.

# clearly explain why this is safe to ignore!
Dockerfile:generic-api-key:52

Important

🛡️ Required Actions

  1. Remove any secrets or sensitive data from your code and commit history
  2. Rotate any exposed credentials immediately
  3. Use environment variables or a secure secret management solution instead of hardcoding
  4. Contact @devsecops team for guidance if you’re unsure about a finding.

🤖 This review was automatically generated by the Readdle Gitleaks GitHub App

@andriydruk andriydruk force-pushed the release/6.2 branch 2 times, most recently from cfea8e5 to 3a835ef Compare November 27, 2025 16:41
@andriydruk andriydruk force-pushed the release/6.2 branch 2 times, most recently from a82144a to 2a8fd8c Compare November 27, 2025 21:16
@andriydruk andriydruk force-pushed the release/6.2 branch 4 times, most recently from 02e4c5f to 1a1b026 Compare December 6, 2025 20:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants