diff options
author | Cristian Adam <cristian.adam@qt.io> | 2020-10-23 17:09:51 +0200 |
---|---|---|
committer | Cristian Adam <cristian.adam@qt.io> | 2020-10-26 12:47:46 +0000 |
commit | 6c841dfbd023c378a09abb01500ebeaad0b8d802 (patch) | |
tree | 39d79abe5cd6a7cde421b06cd9f55cb1a696704a | |
parent | 2c65e2323c26592e74003314ae0a7e0c2e5571da (diff) |
GitHub Actions: Update to use Clang 11.0.0
Change-Id: I015a71a4f53ff3be8609a00bdef47c93161af882
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r-- | .github/workflows/build_cmake.yml | 6 | ||||
-rw-r--r-- | scripts/common.py | 16 |
2 files changed, 12 insertions, 10 deletions
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index cc9a25788f..45d9c8144f 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -4,7 +4,7 @@ on: [push, pull_request] env: QT_VERSION: 5.15.1 - CLANG_VERSION: 100 + CLANG_VERSION: 110 ELFUTILS_VERSION: 0.175 CMAKE_VERSION: 3.18.3 NINJA_VERSION: 1.10.1 @@ -34,7 +34,7 @@ jobs: } - { name: "Ubuntu Latest GCC", artifact: "Linux", - os: ubuntu-latest, + os: ubuntu-20.04, cc: "gcc", cxx: "g++" } - { @@ -251,7 +251,7 @@ jobs: set(libclang "libclang-release_${clang_version}-based-windows-vs2019_32.7z") endif() elseif ("${{ runner.os }}" STREQUAL "Linux") - set(libclang "libclang-release_${clang_version}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z") + set(libclang "libclang-release_${clang_version}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z") elseif ("${{ runner.os }}" STREQUAL "macOS") set(libclang "libclang-release_${clang_version}-based-mac.7z") endif() diff --git a/scripts/common.py b/scripts/common.py index d033108648..a828faca2d 100644 --- a/scripts/common.py +++ b/scripts/common.py @@ -133,16 +133,17 @@ def get_rpath(libfilepath, chrpath=None): chrpath = 'chrpath' try: output = subprocess.check_output([chrpath, '-l', libfilepath]).strip() + decoded_output = output.decode(encoding) if encoding else output except subprocess.CalledProcessError: # no RPATH or RUNPATH return [] marker = 'RPATH=' - index = output.decode(encoding).find(marker) + index = decoded_output.find(marker) if index < 0: marker = 'RUNPATH=' - index = output.find(marker) + index = decoded_output.find(marker) if index < 0: return [] - return output[index + len(marker):].split(':') + return decoded_output[index + len(marker):].split(':') def fix_rpaths(path, qt_deploy_path, qt_install_info, chrpath=None): if chrpath is None: @@ -155,12 +156,13 @@ def fix_rpaths(path, qt_deploy_path, qt_install_info, chrpath=None): if len(rpath) <= 0: return # remove previous Qt RPATH - new_rpath = filter(lambda path: not path.startswith(qt_install_prefix) and not path.startswith(qt_install_libs), - rpath) + new_rpath = list(filter(lambda path: not path.startswith(qt_install_prefix) and not path.startswith(qt_install_libs), + rpath)) # check for Qt linking lddOutput = subprocess.check_output(['ldd', filepath]) - if lddOutput.decode(encoding).find('libQt5') >= 0 or lddOutput.find('libicu') >= 0: + lddDecodedOutput = lddOutput.decode(encoding) if encoding else lddOutput + if lddDecodedOutput.find('libQt5') >= 0 or lddDecodedOutput.find('libicu') >= 0: # add Qt RPATH if necessary relative_path = os.path.relpath(qt_deploy_path, os.path.dirname(filepath)) if relative_path == '.': @@ -180,7 +182,7 @@ def fix_rpaths(path, qt_deploy_path, qt_install_info, chrpath=None): def is_unix_executable(filepath): # Whether a file is really a binary executable and not a script and not a symlink (unix only) if os.path.exists(filepath) and os.access(filepath, os.X_OK) and not os.path.islink(filepath): - with open(filepath) as f: + with open(filepath, 'rb') as f: return f.read(2) != "#!" def is_unix_library(filepath): |