Skip to content

[gtk3] Turn hang into timeout #32327

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

Draft
dg0yt wants to merge 2 commits into
base: master
Choose a base branch
from
+20 −1
Draft

[gtk3] Turn hang into timeout #32327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf40266
[gtk3] Turn hang into timeout
dg0yt Jul 1, 2023
b9505fe
Timeout 5 h
dg0yt Jul 26, 2023
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
13 changes: 13 additions & 0 deletions ports/gtk3/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,19 @@ foreach(dir IN ITEMS "${TARGET_TRIPLET}-dbg" "${TARGET_TRIPLET}-rel")
vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${dir}/build.ninja" "/${dir}/../src/" "/src/")
endif()
endforeach()

# Temporary mitigation for build being stuck for unclear reasons,
# https://github.com/microsoft/vcpkg/issues/29018
if(EXISTS "${SCRIPTS}/cmake/vcpkg_install_meson.cmake")
Copy link
Contributor Author

@dg0yt dg0yt Jul 2, 2023

Choose a reason for hiding this comment

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

Avoiding a hard dependency on this filepath.

file(READ "${SCRIPTS}/cmake/vcpkg_install_meson.cmake" install_meson)
string(REPLACE [[COMMAND "${NINJA}"]] [[
TIMEOUT 18000 # 5 h
COMMAND "${NINJA}"]]
install_meson "${install_meson}"
)
file(WRITE "${CURRENT_BUILDTREES_DIR}/gtk3_install_meson.cmake" "${install_meson}")
include("${CURRENT_BUILDTREES_DIR}/gtk3_install_meson.cmake")
endif()
vcpkg_install_meson(ADD_BIN_TO_PATH)

vcpkg_copy_pdbs()
Expand Down
1 change: 1 addition & 0 deletions ports/gtk3/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "gtk3",
"version": "3.24.38",
"port-version": 1,
"description": "Portable library for creating graphical user interfaces.",
"homepage": "https://www.gtk.org/",
"license": null,
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3022,7 +3022,7 @@
},
"gtk3": {
"baseline": "3.24.38",
"port-version": 0
"port-version": 1
},
"gtkmm": {
"baseline": "4.10.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/gtk3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "13e53adc7d4f128b462577dd4bb11149b1f4152e",
"version": "3.24.38",
"port-version": 1
},
{
"git-tree": "63636acf7b77eead112fc9faa84680d1df97acd3",
"version": "3.24.38",
Expand Down