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.

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

[v8] msys git succeeds but returns error code 255 which is neglible as far as I can tell. #21620

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions ports/v8/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,10 @@ function(v8_fetch)
LOGNAME build-${TARGET_TRIPLET})
else()
vcpkg_execute_required_process(
COMMAND ${GIT} clone --depth 1 ${V8_URL} ${V8_DESTINATION}
COMMAND ${GIT} clone --no-checkout --depth 1 ${V8_URL} ${V8_DESTINATION}
WORKING_DIRECTORY ${V8_SOURCE}
LOGNAME build-${TARGET_TRIPLET})
LOGNAME build-${TARGET_TRIPLET}
VALID_EXIT_CODE 255)
vcpkg_execute_required_process(
COMMAND ${GIT} fetch --depth 1 origin ${V8_REF}
WORKING_DIRECTORY ${V8_SOURCE}/${V8_DESTINATION}
Expand Down
2 changes: 1 addition & 1 deletion ports/v8/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "v8",
"version": "9.1.269.39",
"port-version": 1,
"port-version": 2,
"description": "Google Chrome's JavaScript engine",
"homepage": "https://v8.dev",
"supports": "!(arm | arm64 | uwp | osx)",
Expand Down
7 changes: 5 additions & 2 deletions scripts/cmake/vcpkg_execute_required_process.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ This should be a unique name for different triplets so that the logs don't confl
function(vcpkg_execute_required_process)
cmake_parse_arguments(PARSE_ARGV 0 arg
"ALLOW_IN_DOWNLOAD_MODE"
"WORKING_DIRECTORY;LOGNAME;TIMEOUT;OUTPUT_VARIABLE;ERROR_VARIABLE"
"WORKING_DIRECTORY;LOGNAME;TIMEOUT;OUTPUT_VARIABLE;ERROR_VARIABLE;VALID_EXIT_CODE"
"COMMAND"
)

Expand Down Expand Up @@ -110,7 +110,10 @@ Halting portfile execution.
${output_variable_param}
${error_variable_param}
)
if(NOT error_code EQUAL 0)
if(NOT DEFINED arg_VALID_EXIT_CODE)
set(arg_VALID_EXIT_CODE 0)
endif()
if(NOT error_code EQUAL 0 AND NOT error_code EQUAL ${arg_VALID_EXIT_CODE})
set(stringified_logs "")
foreach(log IN ITEMS "${log_out}" "${log_err}")
if(NOT EXISTS "${log}")
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -7018,7 +7018,7 @@
},
"v8": {
"baseline": "9.1.269.39",
"port-version": 1
"port-version": 2
},
"valijson": {
"baseline": "0.6",
Expand Down
5 changes: 5 additions & 0 deletions versions/v-/v8.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "512492e8af89bfe86da3000bb123645fdffb596b",
"version": "9.1.269.39",
"port-version": 2
},
{
"git-tree": "d179f8f99ecce385eab497b2850e605976f4d9d5",
"version": "9.1.269.39",
Expand Down