Revert "Revert "Bump the Yams and swift-argument-parser tag for main and release/5.4"" #36366

With the version-bump of Yams in swiftlang/swift#36366, Yams `4.0.2` now actually expresses the dependency on Dispatch in its CMake config. With the current behavior of passing `-Ddispatch_DIR` to its CMake build, we have the following problem on Linux: - `swift`'s `build-script` installs Dispatch into a just-built toolchain which we use to build SwiftPM, which will contain, among other things, the Dispatch `.swiftmodule`. - The compiler workspace checkout of `swift-corelibs-libdispatch` also contains a copy of the Dispatch `.swiftmodule`. Both of these will be found, leading to build failures like: ``` /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-main/swift-nightly-install/usr/lib/swift/dispatch/module.modulemap:1:8: error: redefinition of module 'Dispatch' 19:37:47 module Dispatch { 19:37:47 ^ 19:37:47 /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-main/swift-corelibs-libdispatch/dispatch/module.modulemap:1:8: note: previously defined here 19:37:47 module Dispatch { 19:37:47 ^ 19:37:47 ``` We also cannot put off building `libDispatch` until SwiftPM is built, because the `libDispatch` dylib is required to link SwiftPM. Not passing `-Ddispatch_DIR` to Yams' CMake build causes it to successfully locate the Dispatch package in the just-built toolchain on its own.

…build [Change analagous to: swiftlang/swift-package-manager#3363] With the version-bump of Yams in swiftlang/swift#36366, Yams 4.0.2 now actually expresses the dependency on Dispatch in its CMake config. With the current behavior of passing -Ddispatch_DIR to its CMake build, we have the following problem on Linux: - swift's build-script installs Dispatch into a just-built toolchain which we use to build swift-driver, which will contain, among other things, the Dispatch .swiftmodule. - The compiler workspace checkout of swift-corelibs-libdispatch also contains a copy of the Dispatch .swiftmodule. Both of these will be found, leading to build failures like: ``` /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-main/swift-nightly-install/usr/lib/swift/dispatch/module.modulemap:1:8: error: redefinition of module 'Dispatch' 19:37:47 module Dispatch { 19:37:47 ^ 19:37:47 /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-main/swift-corelibs-libdispatch/dispatch/module.modulemap:1:8: note: previously defined here 19:37:47 module Dispatch { 19:37:47 ^ 19:37:47 ``` We also cannot put off building `libDispatch` until SwiftPM is built, because the `libDispatch` dylib is required to link SwiftPM. Not passing `-Ddispatch_DIR` to Yams' CMake build causes it to successfully locate the Dispatch package in the just-built toolchain on its own.

With the version-bump of Yams in swiftlang/swift#36366, Yams `4.0.2` now actually expresses the dependency on Dispatch in its CMake config. With the current behavior of passing `-Ddispatch_DIR` to its CMake build, we have the following problem on Linux: - `swift`'s `build-script` installs Dispatch into a just-built toolchain which we use to build SwiftPM, which will contain, among other things, the Dispatch `.swiftmodule`. - The compiler workspace checkout of `swift-corelibs-libdispatch` also contains a copy of the Dispatch `.swiftmodule`. Both of these will be found, leading to build failures like: ``` /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-main/swift-nightly-install/usr/lib/swift/dispatch/module.modulemap:1:8: error: redefinition of module 'Dispatch' 19:37:47 module Dispatch { 19:37:47 ^ 19:37:47 /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-main/swift-corelibs-libdispatch/dispatch/module.modulemap:1:8: note: previously defined here 19:37:47 module Dispatch { 19:37:47 ^ 19:37:47 ``` We also cannot put off building `libDispatch` until SwiftPM is built, because the `libDispatch` dylib is required to link SwiftPM. Not passing `-Ddispatch_DIR` to Yams' CMake build causes it to successfully locate the Dispatch package in the just-built toolchain on its own.

artemcm · 2021-03-16T20:54:14Z

@swift-ci test Linux

artemcm · 2021-03-17T02:05:06Z

@swift-ci build toolchain

artemcm · 2021-03-17T02:05:17Z

@swift-ci test Apple Silicon macOS platform

swift-ci · 2021-03-17T03:27:36Z

Linux Toolchain (Ubuntu 16.04)
Download Toolchain
Git Sha - 8fd976e

Install command
tar zxf swift-PR-36366-575-ubuntu16.04.tar.gz
More info

shahmishal · 2021-03-17T07:10:00Z

apple/swift-xcode-playground-support#54
@swift-ci test Apple Silicon macOS platform

shahmishal · 2021-03-18T05:40:37Z

@swift-ci test Apple Silicon macOS platform

…build [Change analagous to: swiftlang/swift-package-manager#3363] With the version-bump of Yams in swiftlang/swift#36366, Yams 4.0.2 now actually expresses the dependency on Dispatch in its CMake config. With the current behavior of passing -Ddispatch_DIR to its CMake build, we have the following problem on Linux: - swift's build-script installs Dispatch into a just-built toolchain which we use to build swift-driver, which will contain, among other things, the Dispatch .swiftmodule. - The compiler workspace checkout of swift-corelibs-libdispatch also contains a copy of the Dispatch .swiftmodule. Both of these will be found, leading to build failures like: ``` /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-main/swift-nightly-install/usr/lib/swift/dispatch/module.modulemap:1:8: error: redefinition of module 'Dispatch' 19:37:47 module Dispatch { 19:37:47 ^ 19:37:47 /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-main/swift-corelibs-libdispatch/dispatch/module.modulemap:1:8: note: previously defined here 19:37:47 module Dispatch { 19:37:47 ^ 19:37:47 ``` We also cannot put off building `libDispatch` until SwiftPM is built, because the `libDispatch` dylib is required to link SwiftPM. Not passing `-Ddispatch_DIR` to Yams' CMake build causes it to successfully locate the Dispatch package in the just-built toolchain on its own.

shahmishal · 2021-03-24T16:41:01Z

@swift-ci test Apple Silicon macOS platform

shahmishal · 2021-03-29T19:16:28Z

11:32:01 Test Case '-[SwiftDriverTests.JobExecutorTests testDarwinBasic]' started.
11:32:01 /Users/buildnode/jenkins/workspace/swift-PR-macos-apple-silicon/branch-main/swift-driver/Sources/SwiftDriverExecution/MultiJobExecutor.swift:296: error: -[SwiftDriverTests.JobExecutorTests testDarwinBasic] : failed: caught error: "fatalError"
11:32:01 Test Case '-[SwiftDriverTests.JobExecutorTests testDarwinBasic]' failed (28.004 seconds).
11:32:01 Test Suite 'JobExecutorTests' failed at 2021-03-24 11:32:01.015.

shahmishal · 2021-03-29T19:16:39Z

@swift-ci test Apple Silicon macOS platform

shahmishal · 2021-04-06T17:34:08Z

@swift-ci test Apple Silicon macOS platform

shahmishal · 2021-04-06T17:34:16Z

@swift-ci test

swift-ci · 2021-04-06T19:12:10Z

Build failed
Swift Test Linux Platform
Git Sha - 8fd976e

shahmishal · 2021-04-08T05:56:25Z

@swift-ci test Linux

shahmishal · 2021-04-08T16:59:20Z

@swift-ci test Apple Silicon macOS platform

shahmishal · 2021-04-08T19:51:54Z

11:29:44 Test Case '-[FunctionalTests.PluginTests testUseOfVendedBinaryTool]' started.
11:29:44 
/Users/buildnode/jenkins/workspace/swift-PR-macos-apple-silicon/branch-main/swiftpm/Tests/FunctionalTests/PluginTests.swift:115: error: -[FunctionalTests.PluginTests testUseOfVendedBinaryTool] : failed - terminated(1): /Users/buildnode/jenkins/workspace/swift-PR-macos-apple-silicon/branch-main/buildbot_incremental/swiftpm-macosx-arm64/arm64-apple-macosx/release/swift-build --package-path /var/folders/ld/md151_257fldz2fn_bzqb5hm0000gp/T/Miscellaneous_Plugins.1NXiPb/MyBinaryToolPlugin --configuration debug --product MyLocalTool output:
11:29:44     'MyBinaryToolPlugin' /private/var/folders/ld/md151_257fldz2fn_bzqb5hm0000gp/T/Miscellaneous_Plugins.1NXiPb/MyBinaryToolPlugin: warning: found 1 file(s) which are unhandled; explicitly declare them as resources or exclude from the target
11:29:44         /private/var/folders/ld/md151_257fldz2fn_bzqb5hm0000gp/T/Miscellaneous_Plugins.1NXiPb/MyBinaryToolPlugin/Sources/MyLocalTool/foo.dat
11:29:44     
11:29:44     error: running plugin script failed: signalled(signal: 5):
11:29:44     Fatal error: Error raised at top level: plugin doesn’t have access to any tool named ‘mytool’ [line 13]: file Swift/ErrorType.swift, line 200
11:29:44     
11:29:44     
11:29:44 Test Case '-[FunctionalTests.PluginTests testUseOfVendedBinaryTool]' failed (5.059 seconds).

shahmishal · 2021-04-08T19:52:15Z

@swift-ci test windows

shahmishal · 2021-04-08T19:55:31Z

@swift-ci build toolchain

swift-ci · 2021-04-08T21:18:30Z

Linux Toolchain (Ubuntu 16.04)
Download Toolchain
Git Sha - 8fd976e

Install command
tar zxf swift-PR-36366-585-ubuntu16.04.tar.gz
More info

shahmishal · 2021-04-08T23:47:42Z

@swift-ci test Apple Silicon macOS platform

swift-ci · 2021-04-09T02:11:18Z

macOS Toolchain
Download Toolchain
Git Sha - 8fd976e

Install command
tar -zxf swift-PR-36366-937-osx.tar.gz --directory ~/

…build [Change analagous to: swiftlang/swift-package-manager#3363] With the version-bump of Yams in swiftlang/swift#36366, Yams 4.0.2 now actually expresses the dependency on Dispatch in its CMake config. With the current behavior of passing -Ddispatch_DIR to its CMake build, we have the following problem on Linux: - swift's build-script installs Dispatch into a just-built toolchain which we use to build swift-driver, which will contain, among other things, the Dispatch .swiftmodule. - The compiler workspace checkout of swift-corelibs-libdispatch also contains a copy of the Dispatch .swiftmodule. Both of these will be found, leading to build failures like: ``` /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-main/swift-nightly-install/usr/lib/swift/dispatch/module.modulemap:1:8: error: redefinition of module 'Dispatch' 19:37:47 module Dispatch { 19:37:47 ^ 19:37:47 /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-main/swift-corelibs-libdispatch/dispatch/module.modulemap:1:8: note: previously defined here 19:37:47 module Dispatch { 19:37:47 ^ 19:37:47 ``` We also cannot put off building `libDispatch` until SwiftPM is built, because the `libDispatch` dylib is required to link SwiftPM. Not passing `-Ddispatch_DIR` to Yams' CMake build causes it to successfully locate the Dispatch package in the just-built toolchain on its own. (cherry picked from commit a76b464)

With the version-bump of Yams in swiftlang/swift#36366, Yams `4.0.2` now actually expresses the dependency on Dispatch in its CMake config. With the current behavior of passing `-Ddispatch_DIR` to its CMake build, we have the following problem on Linux: - `swift`'s `build-script` installs Dispatch into a just-built toolchain which we use to build SwiftPM, which will contain, among other things, the Dispatch `.swiftmodule`. - The compiler workspace checkout of `swift-corelibs-libdispatch` also contains a copy of the Dispatch `.swiftmodule`. Both of these will be found, leading to build failures like: ``` /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-main/swift-nightly-install/usr/lib/swift/dispatch/module.modulemap:1:8: error: redefinition of module 'Dispatch' 19:37:47 module Dispatch { 19:37:47 ^ 19:37:47 /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-main/swift-corelibs-libdispatch/dispatch/module.modulemap:1:8: note: previously defined here 19:37:47 module Dispatch { 19:37:47 ^ 19:37:47 ``` We also cannot put off building `libDispatch` until SwiftPM is built, because the `libDispatch` dylib is required to link SwiftPM. Not passing `-Ddispatch_DIR` to Yams' CMake build causes it to successfully locate the Dispatch package in the just-built toolchain on its own. (cherry picked from commit 6af862d)

#3363) (#3423) * [Bootstrap] Do not pass `-Ddispatch_DIR` to the Yams CMake build (#3363) With the version-bump of Yams in swiftlang/swift#36366, Yams `4.0.2` now actually expresses the dependency on Dispatch in its CMake config. With the current behavior of passing `-Ddispatch_DIR` to its CMake build, we have the following problem on Linux: - `swift`'s `build-script` installs Dispatch into a just-built toolchain which we use to build SwiftPM, which will contain, among other things, the Dispatch `.swiftmodule`. - The compiler workspace checkout of `swift-corelibs-libdispatch` also contains a copy of the Dispatch `.swiftmodule`. Both of these will be found, leading to build failures like: ``` /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-main/swift-nightly-install/usr/lib/swift/dispatch/module.modulemap:1:8: error: redefinition of module 'Dispatch' 19:37:47 module Dispatch { 19:37:47 ^ 19:37:47 /home/buildnode/jenkins/workspace/swift-PR-Linux/branch-main/swift-corelibs-libdispatch/dispatch/module.modulemap:1:8: note: previously defined here 19:37:47 module Dispatch { 19:37:47 ^ 19:37:47 ``` We also cannot put off building `libDispatch` until SwiftPM is built, because the `libDispatch` dylib is required to link SwiftPM. Not passing `-Ddispatch_DIR` to Yams' CMake build causes it to successfully locate the Dispatch package in the just-built toolchain on its own. (cherry picked from commit 6af862d) * Fix invalid assumptions leading to unit test failures on Apple Silicon. (#3328) rdar://75113176 (cherry picked from commit 3ff6f8b) * Disable `testExplicitSwiftPackageBuild` on Apple Silicon because it relies on compiler fixes from later compiler versions, on this platform. Co-authored-by: Artem Chikin <[email protected]> Co-authored-by: Anders Bertelrud <[email protected]>

Revert "Revert "Bump the Yams and swift-argument-parser tag for main …

2b9937f

…and release/5.4""

Bump the Swift Argument Parser tag to 0.4.1

8fd976e

artemcm mentioned this pull request Mar 12, 2021

[Build Script] Install libDispatch only after all builds are complete. #36428

Closed

artemcm mentioned this pull request Mar 16, 2021

[Bootstrap] Do not pass -Ddispatch_DIR to the Yams CMake build swiftlang/swift-package-manager#3363

Merged

artemcm mentioned this pull request Mar 16, 2021

[Build Script Helper] Do not pass -Ddispatch_DIR to the Yams CMake build swiftlang/swift-driver#544

Merged

shahmishal merged commit a93593a into main Apr 9, 2021

shahmishal deleted the revert-36361-revert-36296-shahmishal/bump-yams-argument-parser-tag branch April 9, 2021 03:07

shahmishal mentioned this pull request Apr 21, 2021

[5.4] [Build Script Helper] Do not pass -Ddispatch_DIR to the Yams CMake … swiftlang/swift-driver#614

Merged

shahmishal mentioned this pull request Apr 21, 2021

[5.4] [Bootstrap] Do not pass -Ddispatch_DIR to the Yams CMake build (#3363) swiftlang/swift-package-manager#3423

Merged

Revert "Revert "Bump the Yams and swift-argument-parser tag for main and release/5.4"" #36366

Revert "Revert "Bump the Yams and swift-argument-parser tag for main and release/5.4"" #36366

Uh oh!

Conversation

shahmishal commented Mar 9, 2021

Uh oh!

shahmishal commented Mar 9, 2021

Uh oh!

shahmishal commented Mar 9, 2021

Uh oh!

shahmishal commented Mar 9, 2021

Uh oh!

CodaFi commented Mar 9, 2021

Uh oh!

shahmishal commented Mar 9, 2021

Uh oh!

shahmishal commented Mar 9, 2021

Uh oh!

shahmishal commented Mar 9, 2021

Uh oh!

shahmishal commented Mar 9, 2021

Uh oh!

swift-ci commented Mar 9, 2021

Uh oh!

shahmishal commented Mar 10, 2021

Uh oh!

shahmishal commented Mar 10, 2021

Uh oh!

swift-ci commented Mar 10, 2021

Uh oh!

swift-ci commented Mar 10, 2021

Uh oh!

shahmishal commented Mar 11, 2021

Uh oh!

swift-ci commented Mar 11, 2021

Uh oh!

shahmishal commented Mar 11, 2021

Uh oh!

swift-ci commented Mar 11, 2021

Uh oh!

shahmishal commented Mar 11, 2021

Uh oh!

swift-ci commented Mar 11, 2021

Uh oh!

shahmishal commented Mar 11, 2021

Uh oh!

swift-ci commented Mar 11, 2021

Uh oh!

shahmishal commented Mar 11, 2021

Uh oh!

swift-ci commented Mar 11, 2021

Uh oh!

artemcm commented Mar 16, 2021

Uh oh!

artemcm commented Mar 17, 2021

Uh oh!

artemcm commented Mar 17, 2021

Uh oh!

swift-ci commented Mar 17, 2021

Uh oh!

shahmishal commented Mar 17, 2021

Uh oh!

shahmishal commented Mar 18, 2021

Uh oh!

shahmishal commented Mar 24, 2021

Uh oh!

shahmishal commented Mar 29, 2021

Uh oh!

shahmishal commented Mar 29, 2021

Uh oh!

shahmishal commented Apr 6, 2021

Uh oh!

shahmishal commented Apr 6, 2021

Uh oh!

swift-ci commented Apr 6, 2021

Uh oh!

shahmishal commented Apr 8, 2021

Uh oh!

shahmishal commented Apr 8, 2021

Uh oh!