Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: compnerd/swift-build
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: compnerd/swift-build
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: release/6.0
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 20 commits
  • 5 files changed
  • 7 contributors

Commits on Jul 23, 2024

  1. repo: switch default branch to release/6.0

    compnerd committed Jul 23, 2024
    Copy the full SHA
    e0f5ae3 View commit details
  2. Update swift-toolchain.yml

    Apply stable snapshotting to release/6.0 branch rather than main.
    compnerd authored Jul 23, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    ce581eb View commit details
  3. Copy the full SHA
    92d981f View commit details
  4. Fix default.xml.

    Fix a typo for swift-nio.
    Use main for swift-testing because it doesn't have release branches.
    
    apple/swift-testing:
    fatal: couldn't find remote ref refs/heads/release/6.0
    apple/swift-testing: sleeping 4.0 seconds before retrying
    fatal: couldn't find remote ref refs/heads/release/6.0
    error: Cannot fetch apple/swift-testing from https://github.com/apple/swift-testing
    Fetching: 100% (2/2), done in 10.012s
    error: Cannot checkout apple/swift-nio: ManifestInvalidRevisionError: revision release/6.0 in apple/swift-nio not found
    hjyamauchi authored and compnerd committed Jul 23, 2024
    Copy the full SHA
    0eba59b View commit details

Commits on Jul 24, 2024

  1. Update workflow to match release/5.10

    hjyamauchi authored and compnerd committed Jul 24, 2024
    Copy the full SHA
    4fb1bfe View commit details
  2. Override cmake to avoid the cmake 3.30 issue

    * Override cmake to avoid the cmake 3.30 issue.
    
    Co-authored-by: Saleem Abdulrasool <compnerd@compnerd.org>
    hjyamauchi and compnerd authored Jul 24, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    6f13d69 View commit details

Commits on Jul 25, 2024

  1. Update swift-toolchain.yml

    Checkout the release/6.0 branch for snapshotting.
    compnerd authored Jul 25, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    d08423d View commit details
  2. GHA: update for swift-foundation, swift-foundation-icu

    Cherrypick commit 203d5a0
    hjyamauchi authored and compnerd committed Jul 25, 2024
    Copy the full SHA
    fab2eda View commit details
  3. GHA: clean up errant file

    compnerd committed Jul 25, 2024

    Verified

    This commit was signed with the committer’s verified signature.
    compnerd Saleem Abdulrasool
    Copy the full SHA
    2bb5a14 View commit details

Commits on Jul 26, 2024

  1. GHA: correct SDKROOT handling

    We were miscomputing the SDKROOT which would fail to find necessary
    modules when trying to build swift-inspect. Correct the computation and
    simplify the rules a small amount.
    
    Cherry pick commmit 96c7ba3
    hjyamauchi authored and compnerd committed Jul 26, 2024
    Copy the full SHA
    17e660d View commit details

Commits on Jul 27, 2024

  1. GHA: download the SDK to the proper location

    We would previously download the AMD64 SDK to the wrong location and
    would thus fail to find the necessary content.
    
    Cherry pick commit e108a13
    hjyamauchi authored and compnerd committed Jul 27, 2024
    Copy the full SHA
    1074ebc View commit details

Commits on Aug 1, 2024

  1. fix swift-inspect build

    * fix swift-inspect build
    
    * Use single globbed move-item
    
    Cherry pick commit 61ad739
    hjyamauchi authored and compnerd committed Aug 1, 2024
    Copy the full SHA
    ac0cdf5 View commit details

Commits on Aug 6, 2024

  1. Update android corelibs-foundation pinned checkout

    * Update android corelibs-foundation pinned checkout
    
    The checkout needs to be updated after the posix_filesystem apinote fix landed in Swift.
    I needed to switch to my own remote as I could no longer push a new branch into the Apple remote.
    
    * also update swift-installer script pin
    
    Cherry pick commit c6e86cf
    hjyamauchi authored and compnerd committed Aug 6, 2024
    Copy the full SHA
    83e32da View commit details

Commits on Sep 4, 2024

  1. Update default.xml

    Remove ICU from the checkout. This has been superseded by swift-foundation-icu.
    
    Cherry pick commit 5183f32
    hjyamauchi authored and compnerd committed Sep 4, 2024
    Copy the full SHA
    a79081c View commit details

Commits on Oct 7, 2024

  1. release/6.0 build changes cherry-picks (#823)

    * Update default.xml
    
    Remove ICU from the checkout. This has been superseded by swift-foundation-icu.
    
    (cherry picked from commit 5183f32)
    
    * Update default.xml
    
    Add swift-toolchain-sqlite to the toolchain manifest.
    
    (cherry picked from commit 4dc9f92)
    
    * GHA: timestamp the caches
    
    Enable the timestamp in the caches to make sure that the correct cache
    is restored. This should hopefully help increase the cache hit rate.
    
    (cherry picked from commit aada331)
    
    * repo: update the organisations for migrated repositories
    
    Update the organisation for the repositories which have migrated from
    apple to swiftlang.
    
    (cherry picked from commit 73d1501)
    
    * GHA: update workflow for swiftlang/swift#75823
    
    Update to use the new sqlite mirror for the swift toolchain. This
    ensures that we keep in sync with the official toolchain builds.
    
    (cherry picked from commit e626872)
    
    * GHA: remove ICU build after the re-core transition
    
    Remove the ICU dependency as it has been removed from the repo manifest.
    This now requires that we use the re-cored Foundation.
    
    (cherry picked from commit a513566)
    
    * Update default.xml
    
    (cherry picked from commit 9f72dc7)
    
    * [android] checkout unpinned installer script
    
    The pin will no longer be needed since we're switching to swift-foundation
    
    (cherry picked from commit b49b337)
    
    * [GHA workflow] only create a latest release when running on main branch version
    
    (cherry picked from commit ea62eb9)
    
    * GHA: update curl version
    
    CURL was updated to 8.9.1 upstream. Update the build rules to reflect
    that.
    
    (cherry picked from commit 1b5a7bb)
    
    * GHA: split out standard library phase
    
    Split out the standard library build phase to allow us to build the
    macros for the correct hosts. This is required to allow us to build the
    macros for distribution and for the build of the SDK.
    
    Co-authored-by: Alex Lorenz <arphaman@gmail.com>
    (cherry picked from commit 1093ac8)
    
    * [sqlite] Remove Android builds
    
    These are not consumed by any other step.
    
    (cherry picked from commit 1177dfa)
    
    * GHA: introduce a new macros build phase
    
    Introduce a new macros build phase for the Foundation (and eventually
    Testing) macros. This depends on the previously introduced stdlib phase
    as the macros use the standard library. We build the macros for the
    compiler hosts, reusing them to build the SDK content. Wire this into
    the packaging step for the build tools as well.
    
    Co-authored-by: Alex Lorenz <arphaman@gmail.com>
    (cherry picked from commit 400fce1)
    
    * [Mac build] Rename builder to a generic name (#797)
    
    `windows_build_runner` is too Windows-specific. This renames the variable to `default_build_runner`, to make space for future Darwin builds.
    
    The variable is kept to its original name in the `context` step, since this step will eventually also output Darwin variables.
    
    (cherry picked from commit e0239e1)
    
    * [Mac build] Move build to sub-workflow
    
    This is a preliminary step to eventually add the Mac build. The Mac
    build will be using a separate job with its own matrix.
    
    Co-authored-by: Saleem Abdulrasool <compnerd@compnerd.org>
    (cherry picked from commit 0cc87ce)
    
    * GHA: enable HCS on Windows toolchains
    
    Now that the just built clang should no longer perform HCS on scoped EH
    functions, we should be able to enable this optimization globally.
    
    (cherry picked from commit d558028)
    
    * Make runners configurable via workflow input
    
    (cherry picked from commit a75c14e)
    
    * GHA: tweak some names (NFC)
    
    Clean up the job names to be consistent throughout.
    
    (cherry picked from commit ecbfb22)
    
    * GHA: adjustments for the SDK phase
    
    Adjust the paths for the SDK phase, unify the swift-corelibs-foundation
    checkout.
    
    Co-authored-by: Alex Lorenz <arphaman@gmail.com>
    (cherry picked from commit 876ec4a)
    
    * GHA: update repositories for swiftlang migration
    
    Update the repositories which have migrated to the swiftlang
    organisation.
    
    (cherry picked from commit 2395959)
    
    * Properly set SQLite version
    
    This was broken in #796
    
    (cherry picked from commit 8c02c26)
    
    * GHA: repair the Windows runtime/SDK packaging
    
    We now need to download the standard library and the SDK to get the same
    content that we used to previously have in just the SDK. Adjust that
    accordingly.
    
    (cherry picked from commit b91b97e)
    
    * GHA: wire up Foundation macros to swift-corelibs-foundation
    
    We are already building the Foundation macros but did not pass that
    along to the Foundation build. This is now required and failure to pass
    it along results in a build failure. Wire it up so that we can build and
    avoid another build of the macros.
    
    (cherry picked from commit 0463388)
    
    * GHA: setup builds for swift-testing
    
    Introduce a build of swift-testing in the SDK as that is now distributed
    as part of the SDKs upstream. This allows us to have parity with the
    official builds.
    
    (cherry picked from commit 034d28f)
    
    * Add the workspace hash to ccache key (#811)
    
    Depending on the runner configuration, `github.workspace` might be set up differently, resulting in issues when restoring previous builds from sccache. In order to work around this issue, this adds a hash of `github.workspace` to the sccache key to uniquely identify the build between different runner types.
    
    (cherry picked from commit 0579aa8)
    
    * Use runners from vars if available (#812)
    
    This was removed in #801 to bring the file in line with downstream.
    However, it is better to rely on the vars environment when invoking the
    main workflow from dispatch, while offering an override when invoking
    the workflow as a sub-workflow.
    
    (cherry picked from commit 67bb06c)
    
    * GHA: correct swift-testing macro provider
    
    The plugin name is `TestingMacros.dll` not `SwiftTesting.dll`. Correct
    the spelling for the build.
    
    (cherry picked from commit 4ca63bb)
    
    * GHA: specify Swift compile target, C++ compiler, install location
    
    Add missing flags for swift-testing configuration. This is primarily the
    C++ compiler, target triple, and the install location.
    
    (cherry picked from commit 9210338)
    
    * GHA: remove swift-syntax dependency for SDK
    
    This is no longer needed as we pre-build the macros and no longer need
    to match up the swift-syntax build from the toolchain.
    
    (cherry picked from commit e6a8682)
    
    * GHA: fork swift-testing for Android fixes
    
    Pull the future main branch for Android fixes.
    
    (cherry picked from commit 8336d10)
    
    * GHA: restructure devtools build
    
    Setup `SDKROOT` environment variable rather than inlining that at each
    site. This greatly simplifies the CMake invocation. Additionally,
    extract prebuilt content into `BinaryCache` rather than `BuildRoot`
    which allows us to easily isolate the built artifacts for upload.
    
    (cherry picked from commit 105a9e4)
    
    * GHA: add a workaround for old Swift driver
    
    workaround the issue with missing new swift driver when building swift
    testing for android by disabling CMP0157.
    
    (cherry picked from commit 0b18205)
    
    * GHA: download additional images when packaging
    
    Pull in the Android stdlib when building Android installer MSI.
    
    (cherry picked from commit 3f2b15d)
    
    * Fix devtools stage (#815)
    
    * build with explicit -sdk passed into Swift
     * The SDKROOT environment variable isn't enough when using the old driver
    * checkout latest swift testing
    * pass c++ flags and c++ compiler for the markdown build
    * download devtools host sdk after the target libs are setup correctly
    * fix cmark path
    * debugging tools: download stdlib as well
    
    (cherry picked from commit 6ba7e5f)
    
    ---------
    
    Co-authored-by: Saleem Abdulrasool <compnerd@compnerd.org>
    Co-authored-by: Fabrice de Gans <fabrice@thebrowser.company>
    Co-authored-by: Fabrice de Gans <Steelskin@users.noreply.github.com>
    Co-authored-by: Saleem Abdulrasool <abdulras@thebrowser.company>
    5 people authored Oct 7, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    199b9c8 View commit details

Commits on Nov 8, 2024

  1. Copy the full SHA
    e1bdb76 View commit details

Commits on Nov 20, 2024

  1. [workflow] fixes required to build swift 6 branch (#848)

    * [swift 6] update the baseline compiler to 20231016.5 to resolve 'declval' assertion
    
    * [swift 6] drop extraneous base toolchain installation in the sdk step
    
    this was placed there erroneously during conflict resolution
    
    * [swift 6] workaround swift 6 crash on x86 windows build
    
    * [swift 6] add wix toolset installation for the installer step
    
    * Fix a swift-testing build issue
    
    This follows swiftlang/swift@ff0f923
    
    (cherry picked from commit 34a9cdc)
    
    ---------
    
    Co-authored-by: Hiroshi Yamauchi <hjyamauchi@gmail.com>
    hyp and hjyamauchi authored Nov 20, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    51b3c12 View commit details

Commits on Dec 6, 2024

  1. Partial cherry-pick: Fixes to get main working downstream again (#841)

    * Do not attempt NuGet registration
    
    This is now failing as NuGet is registered:
    
    ```
    Register-PackageSource: D:\r\_work\_temp\c04a7ca5-aa41-491b-b9ad-0e09fb799d0c.ps1:4
    Line |
       4 |      Register-PackageSource -Name NuGet -Location https://www.nuget.or …
         |      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         | Package Source 'NuGet' exists.
    ```
    
    https://github.com/thebrowsercompany/swift-build/actions/runs/11656344808/job/32454421580
    (cherry picked from commit e2e1a79)
    hyp authored and compnerd committed Dec 6, 2024
    Copy the full SHA
    469b815 View commit details

Commits on Feb 5, 2025

  1. Update the Wix version to 4.0.6 (#894)

    hjyamauchi authored Feb 5, 2025

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    56bdf79 View commit details

Commits on Mar 10, 2025

  1. Use commit hash for dependent actions (#917)

    * Refer to specific commit hashes rather than a branch like main for
      dependent actions.
    
    Cherry pick commit 3b0b63a
    hjyamauchi authored Mar 10, 2025

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    d49ad2b View commit details
Showing with 1,931 additions and 1,344 deletions.
  1. +395 −0 .github/workflows/build-toolchain.yml
  2. +4 −7 .github/workflows/release-swift-toolchain-schedule.yml
  3. +1,502 −1,283 .github/workflows/swift-toolchain.yml
  4. +0 −23 cmake/SQLite/CMakeLists.txt
  5. +30 −31 default.xml
Loading