[go: nahoru, domu]
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Workaround for Linux x86 build: downgrade libraries on GitHub runners #764

Merged
merged 42 commits into from
Nov 30, 2021
Merged

Workaround for Linux x86 build: downgrade libraries on GitHub runners #764

Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
b4b1082
Change all ccache vcpkg hashes.
jonsimantov Nov 29, 2021
37e99ee
Add some debugging output to bootstap-vcpkg
jonsimantov Nov 29, 2021
b1bad68
Redirect all stderr to stdout
jonsimantov Nov 29, 2021
442b6c9
Check return code of vcpkg commands.
jonsimantov Nov 29, 2021
0b81ff2
Let's see what's in this log.
jonsimantov Nov 29, 2021
8e74cfe
Print log.
jonsimantov Nov 29, 2021
b6eef01
Add additional x86 libs.
jonsimantov Nov 29, 2021
81204e3
Restore code back to normal - check for errors in apt.
jonsimantov Nov 29, 2021
342ea15
Let apt try to fix the deps.
jonsimantov Nov 29, 2021
821d4ed
Remove unneeded dependencies - let apt fix.
jonsimantov Nov 29, 2021
55a1f0e
Use apt-get instead of apt.
jonsimantov Nov 29, 2021
b512071
Try apt upgrading first.
jonsimantov Nov 29, 2021
7c15e83
Add additional deps back in
jonsimantov Nov 29, 2021
ac2572a
Add more explicit deps.
jonsimantov Nov 29, 2021
b018448
Yet more deps.
jonsimantov Nov 29, 2021
c8e84eb
More deps.
jonsimantov Nov 29, 2021
3b36bef
Show held packages
jonsimantov Nov 29, 2021
cf51693
Install one at a time.
jonsimantov Nov 29, 2021
d6aee77
Try allowing overriding held packages
jonsimantov Nov 29, 2021
fc0f87b
Try doing an upgrade rather than a regular install.
jonsimantov Nov 29, 2021
4fb6400
Enable allow-change-held-packages
jonsimantov Nov 29, 2021
c1336e6
Try dist-upgrade.
jonsimantov Nov 29, 2021
cdc256e
Put prereqs back
jonsimantov Nov 29, 2021
2f801c3
Add additional deps
jonsimantov Nov 29, 2021
7e4f98b
Add ridiculous number of deps, just to see
jonsimantov Nov 29, 2021
1c02fe4
Allow downgrading packages
jonsimantov Nov 29, 2021
c0959bd
Try downgrading libpcre
jonsimantov Nov 29, 2021
21d196e
Make workaround only used on gha_build runners.
jonsimantov Nov 30, 2021
5276f70
Remove extra logging.
jonsimantov Nov 30, 2021
179208b
Fix comment.
jonsimantov Nov 30, 2021
7fd719c
Remove extra return vars
jonsimantov Nov 30, 2021
64a1815
Restore the ccache keys to the previous value.
jonsimantov Nov 30, 2021
f8f8d98
Fix comment.
jonsimantov Nov 30, 2021
2139182
Ensure 64-bit libsecret stays installed.
jonsimantov Nov 30, 2021
67ae3ab
Ensure libsecret 64-bit is installed only when we downgrade
jonsimantov Nov 30, 2021
c807009
Force libsecret to a specific version too.
jonsimantov Nov 30, 2021
04db882
Change comment and pin libsecret version
jonsimantov Nov 30, 2021
4c963a3
Update libsecret version
jonsimantov Nov 30, 2021
60f0fba
Try re-installing libsecret after it is uninstalled.
jonsimantov Nov 30, 2021
e2e9900
Add additional workaround for linux x86 build.
jonsimantov Nov 30, 2021
8f7e2ef
Format code
jonsimantov Nov 30, 2021
54ef75a
Format comment
jonsimantov Nov 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Try re-installing libsecret after it is uninstalled.
  • Loading branch information
@jonsimantov
jonsimantov committed Nov 30, 2021
commit 60f0fba3d7a11c5431711fc8bfaea31a348b1cd6
4 changes: 3 additions & 1 deletion scripts/gha/build_desktop.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def install_x86_support_libraries(gha_build=False):
# to get around this issue. This will presumably be fixed in a future
# Ubuntu update.
packages = (['--allow-downgrades'] + packages +
['libpcre2-8-0=10.34-7', 'libsecret-1-dev=0.20.4-0ubuntu1'])
['libpcre2-8-0=10.34-7'])

# First check if these packages exist on the machine already
devnull = open(os.devnull, "w")
Expand All @@ -87,6 +87,8 @@ def install_x86_support_libraries(gha_build=False):
utils.run_command(['dpkg', '--add-architecture', 'i386'], as_root=True, check=True)
utils.run_command(['apt', 'update'], as_root=True, check=True)
utils.run_command(['apt', 'install', '-V', '-y'] + packages, as_root=True, check=True)
utils.run_command(['apt', 'install', '-f', '-V', '-y', 'libsecret-1-dev'],
as_root=True, check=True)


def _install_cpp_dependencies_with_vcpkg(arch, msvc_runtime_library, use_openssl=False):
Expand Down