diff --git a/ports/v8/portfile.cmake b/ports/v8/portfile.cmake index bbf42562308728..c0206c66089adc 100644 --- a/ports/v8/portfile.cmake +++ b/ports/v8/portfile.cmake @@ -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} diff --git a/ports/v8/vcpkg.json b/ports/v8/vcpkg.json index ba8cfa771402bb..fa621d36e3438e 100644 --- a/ports/v8/vcpkg.json +++ b/ports/v8/vcpkg.json @@ -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)", diff --git a/scripts/cmake/vcpkg_execute_required_process.cmake b/scripts/cmake/vcpkg_execute_required_process.cmake index 27024fecfce862..24f5666bfb7a15 100644 --- a/scripts/cmake/vcpkg_execute_required_process.cmake +++ b/scripts/cmake/vcpkg_execute_required_process.cmake @@ -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" ) @@ -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}") diff --git a/versions/baseline.json b/versions/baseline.json index 66529b40d4651d..443462af79a0a9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7018,7 +7018,7 @@ }, "v8": { "baseline": "9.1.269.39", - "port-version": 1 + "port-version": 2 }, "valijson": { "baseline": "0.6", diff --git a/versions/v-/v8.json b/versions/v-/v8.json index 9a859f286bc93a..dbc6be1f87d619 100644 --- a/versions/v-/v8.json +++ b/versions/v-/v8.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "512492e8af89bfe86da3000bb123645fdffb596b", + "version": "9.1.269.39", + "port-version": 2 + }, { "git-tree": "d179f8f99ecce385eab497b2850e605976f4d9d5", "version": "9.1.269.39",