Linux: Build CMake if the checked out version is newer than the installed version. #26704

spevans · 2019-08-16T23:00:50Z

For Linux only, if the checked out CMake repository is a newer version than the installed CMake version, build and use CMake from source.

This does not affect macOS build or set any minimum required CMake version in CMakeLists.txt

spevans · 2019-08-16T23:02:00Z

@swift-ci test

swift-ci · 2019-08-17T00:13:23Z

Build failed
Swift Test Linux Platform
Git Sha - c0c054f0e6998c15a63e6b4ba305e282d9714946

swift-ci · 2019-08-17T00:19:18Z

Build failed
Swift Test OS X Platform
Git Sha - c0c054f0e6998c15a63e6b4ba305e282d9714946

spevans · 2019-08-17T07:48:13Z

@swift-ci test

swift-ci · 2019-08-17T08:48:59Z

Build failed
Swift Test OS X Platform
Git Sha - c0c054f0e6998c15a63e6b4ba305e282d9714946

swift-ci · 2019-08-17T08:50:32Z

Build failed
Swift Test Linux Platform
Git Sha - c0c054f0e6998c15a63e6b4ba305e282d9714946

spevans · 2019-08-17T12:50:49Z

@swift-ci test

swift-ci · 2019-08-17T12:51:17Z

Build failed
Swift Test OS X Platform
Git Sha - c0c054f0e6998c15a63e6b4ba305e282d9714946

swift-ci · 2019-08-17T12:53:03Z

Build failed
Swift Test Linux Platform
Git Sha - c0c054f0e6998c15a63e6b4ba305e282d9714946

spevans · 2019-08-17T15:21:40Z

@swift-ci test

swift-ci · 2019-08-17T15:23:51Z

Build failed
Swift Test Linux Platform
Git Sha - 35b37ef90c0b3830ec6bc4e23c50755ba76497e0

swift-ci · 2019-08-17T15:26:06Z

Build failed
Swift Test OS X Platform
Git Sha - 35b37ef90c0b3830ec6bc4e23c50755ba76497e0

utils/swift_build_support/swift_build_support/cmake.py

compnerd · 2019-08-17T17:49:11Z

CC: @shahmishal @Rostepher @drodriguez

compnerd

LGTM

compnerd · 2019-08-17T18:29:40Z

utils/swift_build_support/swift_build_support/cmake.py

else is unnecessary after the return.

swift-ci · 2019-08-17T18:32:25Z

Build failed
Swift Test OS X Platform
Git Sha - 82b205595d64e7fcdf780d89bde2e89b4e4be218

swift-ci · 2019-08-17T18:32:31Z

Build failed
Swift Test Linux Platform
Git Sha - 82b205595d64e7fcdf780d89bde2e89b4e4be218

spevans · 2019-08-17T20:08:19Z

@swift-ci test macOS

swift-ci · 2019-08-17T21:45:46Z

Build failed
Swift Test OS X Platform
Git Sha - 79ba077f605b227772389bf8f72ec8ca43a53458

spevans · 2019-08-17T22:08:08Z

@swift-ci test macOS

shahmishal · 2019-08-21T01:19:46Z

@swift-ci test

shahmishal · 2019-08-21T01:21:11Z

@spevans can you please verify this works on Ubuntu 14.04 and 18.04?

…lled version. - For Linux only, if the checked out CMake repository is a newer version than the installed CMake version or CMake is not installed, build and use CMake from source. - This does not affect macOS build or set any minimum required CMake version in CMakeLists.txt

spevans · 2019-08-21T11:07:20Z

@swift-ci test

swift-ci · 2019-08-21T11:09:36Z

Build failed
Swift Test Linux Platform
Git Sha - 79ba077f605b227772389bf8f72ec8ca43a53458

swift-ci · 2019-08-21T11:11:13Z

Build failed
Swift Test OS X Platform
Git Sha - 79ba077f605b227772389bf8f72ec8ca43a53458

spevans · 2019-08-21T14:04:27Z

@shahmishal Ive just tested it locally on 14.04 and 18.04 and it worked ok.

drodriguez · 2019-08-22T18:42:31Z

utils/swift_build_support/swift_build_support/cmake.py

+        (i_major, i_minor, i_patch) = self.installed_cmake_version(cmake_binary)
+        (s_major, s_minor, s_patch) = self.cmake_source_version(cmake_source_dir)
+        if (i_major > s_major or (i_major == s_major and i_minor >= s_minor) or
+            (i_major == s_major and i_minor == s_minor and i_patch >= s_patch)):


In Python you can simply do self.installed_cmake_version(cmake_binary) > self.cmake_source_version(cmake_source_dir) and the tuples will be compared lexicographically.

Thanks for the info I will sort out a fix.

shahmishal · 2019-08-22T19:09:19Z

I am going to merge this, but please create a new PR to simplify the suggestion @drodriguez had. Thanks!

aschwaighofer · 2019-08-22T21:00:46Z

This breaks the incremental build because of python lint errors.
https://ci.swift.org/job/oss-swift-incremental-RA-osx/8587

I am going to revert.

aschwaighofer · 2019-08-22T21:02:19Z

FAIL: Swift(macosx-x86_64) :: Python/python-lint.swift (7244 of 12214)
******************** TEST 'Swift(macosx-x86_64) :: Python/python-lint.swift' FAILED ********************
Script:
--
: 'RUN: at line 1';   /usr/bin/python /Users/buildnode/jenkins/workspace/oss-swift-incremental-RA-osx/swift/utils/python_lint.py
--
Exit Code: 1

Command Output (stdout):
--
./utils/build-script:1046:80: E501 line too long (82 > 79 characters)
./utils/swift_build_support/swift_build_support/cmake.py:23:1: I100 Import statements are in the wrong order. import re should be before from .
./utils/swift_build_support/swift_build_support/cmake.py:24:1: I100 Import statements are in the wrong order. import os should be before import re
./utils/swift_build_support/swift_build_support/cmake.py:188:37: E127 continuation line over-indented for visual indent
./utils/swift_build_support/swift_build_support/cmake.py:191:80: E501 line too long (82 > 79 characters)
./utils/swift_build_support/swift_build_support/cmake.py:200:47: E127 continuation line over-indented for visual indent
./utils/swift_build_support/swift_build_support/cmake.py:224:36: E127 continuation line over-indented for visual indent
./utils/swift_build_support/swift_build_support/cmake.py:238:80: E501 line too long (86 > 79 characters)
./utils/swift_build_support/swift_build_support/cmake.py:246:41: E127 continuation line over-indented for visual indent
./utils/swift_build_support/swift_build_support/cmake.py:250:80: E501 line too long (82 > 79 characters)
./utils/swift_build_support/swift_build_support/cmake.py:251:80: E501 line too long (85 > 79 characters)
./utils/swift_build_support/swift_build_support/cmake.py:257:80: E501 line too long (80 > 79 characters)
./utils/swift_build_support/swift_build_support/cmake.py:268:80: E501 line too long (80 > 79 characters)
./utils/swift_build_support/swift_build_support/cmake.py:269:80: E501 line too long (81 > 79 characters)
./utils/swift_build_support/swift_build_support/cmake.py:271:13: E129 visually indented line with same indent as next logical line
./utils/swift_build_support/swift_build_support/cmake.py:271:80: E501 line too long (80 > 79 characters)

--

********************

aschwaighofer · 2019-08-22T21:05:41Z

Please reapply with those errors fixed.

spevans · 2019-08-22T21:18:15Z

@aschwaighofer I'll sort out the linter errors, but shouldnt the linter have run as part of the macOS ci-tests and failed earlier or is it run as a separate CI test?

aschwaighofer · 2019-08-22T21:23:53Z

@spevans It should run as part of @swift-ci test (if not even smoke-test).

spevans requested a review from compnerd August 16, 2019 23:00

spevans force-pushed the pr_linux_build_cmake branch from c0c054f to 35b37ef Compare August 17, 2019 12:50

spevans force-pushed the pr_linux_build_cmake branch from 35b37ef to 82b2055 Compare August 17, 2019 15:21

compnerd reviewed Aug 17, 2019

View reviewed changes

spevans force-pushed the pr_linux_build_cmake branch from e70a80b to 79ba077 Compare August 17, 2019 18:26

compnerd reviewed Aug 17, 2019

View reviewed changes

utils/swift_build_support/swift_build_support/cmake.py Outdated

Copy link

Member

compnerd Aug 17, 2019

Choose a reason for hiding this comment

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

else is unnecessary after the return.

spevans force-pushed the pr_linux_build_cmake branch from 79ba077 to ded44f5 Compare August 21, 2019 11:06

drodriguez reviewed Aug 22, 2019

View reviewed changes

shahmishal merged commit bebbcf4 into swiftlang:master Aug 22, 2019

aschwaighofer mentioned this pull request Aug 22, 2019

Revert "Linux: Build CMake if the checked out version is newer than the installed version." #26787

Merged

spevans mentioned this pull request Aug 22, 2019

Linux: Build CMake if the checked out version is newer than the installed version - Take2 #26793

Merged

Linux: Build CMake if the checked out version is newer than the installed version. #26704

Linux: Build CMake if the checked out version is newer than the installed version. #26704

Uh oh!

Conversation

spevans commented Aug 16, 2019

Uh oh!

spevans commented Aug 16, 2019

Uh oh!

swift-ci commented Aug 17, 2019

Uh oh!

swift-ci commented Aug 17, 2019

Uh oh!

spevans commented Aug 17, 2019

Uh oh!

swift-ci commented Aug 17, 2019

Uh oh!

swift-ci commented Aug 17, 2019

Uh oh!

spevans commented Aug 17, 2019

Uh oh!

swift-ci commented Aug 17, 2019

Uh oh!

swift-ci commented Aug 17, 2019

Uh oh!

spevans commented Aug 17, 2019

Uh oh!

swift-ci commented Aug 17, 2019

Uh oh!

swift-ci commented Aug 17, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

compnerd commented Aug 17, 2019

Uh oh!

compnerd left a comment

Choose a reason for hiding this comment

Uh oh!

compnerd Aug 17, 2019

Choose a reason for hiding this comment

Uh oh!

swift-ci commented Aug 17, 2019

Uh oh!

swift-ci commented Aug 17, 2019

Uh oh!

spevans commented Aug 17, 2019

Uh oh!

swift-ci commented Aug 17, 2019

Uh oh!

spevans commented Aug 17, 2019

Uh oh!

shahmishal commented Aug 21, 2019

Uh oh!

shahmishal commented Aug 21, 2019

Uh oh!

spevans commented Aug 21, 2019

Uh oh!

swift-ci commented Aug 21, 2019

Uh oh!

swift-ci commented Aug 21, 2019

Uh oh!

spevans commented Aug 21, 2019

Uh oh!

drodriguez Aug 22, 2019

Choose a reason for hiding this comment

Uh oh!

spevans Aug 22, 2019

Choose a reason for hiding this comment

Uh oh!

shahmishal commented Aug 22, 2019

Uh oh!

aschwaighofer commented Aug 22, 2019

Uh oh!

aschwaighofer commented Aug 22, 2019

Uh oh!

aschwaighofer commented Aug 22, 2019

Uh oh!

spevans commented Aug 22, 2019