[BuildScript] Add products for Swift-DocC and Swift-DocC-Render by d-ronnqvist · Pull Request #39723 · swiftlang/swift

d-ronnqvist · 2021-10-13T20:32:19Z

This adds build script products for Swift-DocC and Swift-DocC-Render so that these projects can be built as part of a Swift toolchain.

This adds two new flags to ./utils/build-script (--swiftdocc and --swiftdoccrender) and updates the buildbot_linux preset and the mixin_osx_package_base preset to build Swift-DocC but not Swift-DocC-Render.

Instead, when only --swiftdocc is passed, the Swift-DocC product will copy the already built swift-docc-render template included in the host toolchain (when present) over to the install toolchain. If the host toolchain doesn't include a swift-docc-render template, the Swift-DocC product will raise a warning.

This allows developers to build Swift-DocC from source as part of a toolchain without needing to build Swift-DocC-Render from source (assuming that they haven't made any changes to the Swift-DocC-Render source code).

For developers who want to build a toolchain with both Swift-DocC and Swift-DocC-Render built from source, there are new presets that also include the --swiftdoccrender flag. There's also a new --swift-docc-render flag added to ./utils/build-toolchain which selects a preset that build Swift-DocC-Render.

Resolves rdar://79703353

(rdar://79703353)

QuietMisdreavus · 2021-10-13T20:36:20Z

@swift-ci Please test

QuietMisdreavus · 2021-10-13T20:36:27Z

@swift-ci Please build toolchain

shahmishal · 2021-10-13T21:01:37Z

swiftlang/swift-integration-tests#93
@swift-ci build toolchain

swift-ci · 2021-10-13T23:24:03Z

Build failed
Swift Test Linux Platform
Git Sha - f662d50

swift-ci · 2021-10-14T00:03:10Z

Build failed
Swift Test OS X Platform
Git Sha - f662d50

shahmishal · 2021-10-14T01:29:50Z

@swift-ci Please test macOS

swift-ci · 2021-10-14T05:35:05Z

Build failed
Swift Test OS X Platform
Git Sha - f662d50

shahmishal · 2021-10-20T00:34:23Z

@swift-ci test

shahmishal · 2021-10-20T00:34:33Z

swiftlang/swift-integration-tests#93
@swift-ci build toolchain

swift-ci · 2021-10-20T02:29:29Z

Build failed
Swift Test OS X Platform
Git Sha - 6fff54d

swift-ci · 2021-10-20T02:55:03Z

Build failed
Swift Test Linux Platform
Git Sha - 6fff54d

shahmishal · 2021-10-21T22:58:30Z

swiftlang/swift-integration-tests#93
@swift-ci build toolchain

shahmishal · 2021-10-21T22:58:46Z

@swift-ci test

swift-ci · 2021-10-22T01:06:27Z

Build failed
Swift Test Linux Platform
Git Sha - 6fff54d

swift-ci · 2021-10-22T01:14:16Z

Build failed
Swift Test OS X Platform
Git Sha - 6fff54d

shahmishal · 2021-10-27T01:58:02Z

swiftlang/swift-integration-tests#93
@swift-ci build toolchain

swift-ci · 2021-10-27T05:42:43Z

Linux Toolchain (Ubuntu 16.04)
Download Toolchain
Git Sha - 6fff54d

Install command
tar zxf swift-PR-39723-717-ubuntu16.04.tar.gz
More info

d-ronnqvist · 2021-10-27T15:52:50Z

@swift-ci test

swift-ci · 2021-10-27T17:24:41Z

Build failed
Swift Test Linux Platform
Git Sha - 6fff54d

swift-ci · 2021-10-27T18:28:56Z

Build failed
Swift Test OS X Platform
Git Sha - 6fff54d

Adding the required `get_dependencies` class method should resolve the remaining test failures we're seeing for macOS toolchain builds.

ethan-kusters · 2021-10-29T21:32:02Z

swiftlang/swift-integration-tests#93
@swift-ci build toolchain

ethan-kusters · 2021-10-29T21:32:16Z

@swift-ci test

swift-ci · 2021-10-29T22:52:09Z

Build failed
Swift Test Linux Platform
Git Sha - 4d73833

ethan-kusters · 2021-10-29T23:09:31Z

@swift-ci Please test Linux platform

swift-ci · 2021-10-29T23:55:58Z

Linux Toolchain (Ubuntu 16.04)
Download Toolchain
Git Sha - 4d73833

Install command
tar zxf swift-PR-39723-720-ubuntu16.04.tar.gz
More info

swift-ci · 2021-10-30T04:43:56Z

macOS Toolchain
Download Toolchain
Git Sha - 4d73833

Install command
tar -zxf swift-PR-39723-1204-osx.tar.gz --directory ~/

…in-build-script" This reverts commit 0a04cce, reversing changes made to 2ad0eb7.

Add build script products for Swift-DocC and Swift-DocC-Render

f662d50

(rdar://79703353)

shahmishal approved these changes Oct 13, 2021

View reviewed changes

ethan-kusters mentioned this pull request Oct 14, 2021

Add support for building Swift-DocC-Render in Swift CI swiftlang/swift-docker#251

Closed

Use swift-docc-render-artifact instead of building swift-docc-render

6fff54d

ethan-kusters mentioned this pull request Oct 20, 2021

Port to Android swiftlang/swift-docc#5

Merged

3 tasks

Add get_dependencies method to Swift-DocC-Render script

4d73833

Adding the required `get_dependencies` class method should resolve the remaining test failures we're seeing for macOS toolchain builds.

franklinsch merged commit 0a04cce into swiftlang:main Nov 2, 2021

franklinsch mentioned this pull request Nov 2, 2021

Revert "Bump Swift version" swiftlang/swift-markdown#11

Merged

Kyle-Ye mentioned this pull request Nov 3, 2021

Implement ClangImporter importSourceLoc and importSourceRange #40010

Merged

etcwilde added a commit to etcwilde/swift that referenced this pull request Nov 3, 2021

Revert "Merge pull request swiftlang#39723 from d-ronnqvist/add-docc-…

7f1148c

…in-build-script" This reverts commit 0a04cce, reversing changes made to 2ad0eb7.

Kyle-Ye mentioned this pull request Dec 11, 2021

Update the usage of docc apple/swift-distributed-actors#865

Merged

Conversation

d-ronnqvist commented Oct 13, 2021

Uh oh!

QuietMisdreavus commented Oct 13, 2021

Uh oh!

QuietMisdreavus commented Oct 13, 2021

Uh oh!

shahmishal commented Oct 13, 2021

Uh oh!

swift-ci commented Oct 13, 2021

Uh oh!

swift-ci commented Oct 14, 2021

Uh oh!

shahmishal commented Oct 14, 2021

Uh oh!

swift-ci commented Oct 14, 2021

Uh oh!

shahmishal commented Oct 20, 2021

Uh oh!

shahmishal commented Oct 20, 2021

Uh oh!

swift-ci commented Oct 20, 2021

Uh oh!

swift-ci commented Oct 20, 2021

Uh oh!

shahmishal commented Oct 21, 2021

Uh oh!

shahmishal commented Oct 21, 2021

Uh oh!

swift-ci commented Oct 22, 2021

Uh oh!

swift-ci commented Oct 22, 2021

Uh oh!

shahmishal commented Oct 27, 2021

Uh oh!

swift-ci commented Oct 27, 2021

Uh oh!

d-ronnqvist commented Oct 27, 2021

Uh oh!

swift-ci commented Oct 27, 2021

Uh oh!

swift-ci commented Oct 27, 2021

Uh oh!

ethan-kusters commented Oct 29, 2021

Uh oh!

ethan-kusters commented Oct 29, 2021

Uh oh!

swift-ci commented Oct 29, 2021

Uh oh!

ethan-kusters commented Oct 29, 2021

Uh oh!

swift-ci commented Oct 29, 2021

Uh oh!

swift-ci commented Oct 30, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants