From 99294c5a6efb3d26c0b246265d212051ce44905f Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Wed, 30 Oct 2024 21:59:24 -0700 Subject: [PATCH] Regenerate artifacts. --- .github/workflows/ci.yml | 4 +-- .vscode/settings.json | 8 +++++- builds/cmake/CMakePresets.json | 45 ------------------------------- builds/vscode/node.code-workspace | 9 +++++++ install-cmakepresets.sh | 14 ++-------- 5 files changed, 20 insertions(+), 60 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 14ab8ad93..345319348 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -496,7 +496,7 @@ jobs: packages: "" - os: ubuntu-22.04 - preset: "nix-gnu-release-static-size" + preset: "nix-gnu-release-static" cxx: "clang++-15" link: "static" optimization: "size" @@ -511,7 +511,7 @@ jobs: packages: "" - os: ubuntu-22.04 - preset: "nix-gnu-release-shared-size" + preset: "nix-gnu-release-shared" cxx: "g++-11" link: "dynamic" optimization: "size" diff --git a/.vscode/settings.json b/.vscode/settings.json index c40aba845..20cdf0a78 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,10 @@ { +<<<<<<< HEAD "cmake.sourceDirectory": "/home/nixmini/Repository/Source/libbitcoin-node/builds/cmake", "cmake.useCMakePresets": "always" -} \ No newline at end of file +} +======= + "cmake.sourceDirectory": "${workspaceFolder}/builds/cmake", + "cmake.useCMakePresets": "always" +} +>>>>>>> e3e1a43d (Regenerate artifacts.) diff --git a/builds/cmake/CMakePresets.json b/builds/cmake/CMakePresets.json index b18fc1657..8637f1a33 100644 --- a/builds/cmake/CMakePresets.json +++ b/builds/cmake/CMakePresets.json @@ -74,15 +74,6 @@ } } }, - { - "name": "gnu-optimized-size", - "description": "Factored size optimization settings.", - "hidden": true, - "cacheVariables": { - "CMAKE_C_FLAGS": "$env{CMAKE_C_FLAGS} -Os", - "CMAKE_CXX_FLAGS": "$env{CMAKE_CXX_FLAGS} -Os" - } - }, { "name": "nix-gnu-debug-static", "displayName": "*nix/GNU/Debug/Static", @@ -126,30 +117,6 @@ "gnu-release", "nix-base" ] - }, - { - "name": "nix-gnu-release-static-size", - "displayName": "*nix/GNU/Release/Static/Size", - "description": "Release build with static linking and optimizations for size.", - "hidden": false, - "inherits": [ - "gnu-optimized-size", - "static", - "gnu-release", - "nix-base" - ] - }, - { - "name": "nix-gnu-release-shared-size", - "displayName": "*nix/GNU/Release/Shared/Size", - "description": "Release build with shared linking and optimizations for size.", - "hidden": false, - "inherits": [ - "gnu-optimized-size", - "shared", - "gnu-release", - "nix-base" - ] } ], "buildPresets": [ @@ -185,18 +152,6 @@ "displayName": "*nix/GNU/Release/Shared", "inherits": [ "nix-target-list" ], "configurePreset": "nix-gnu-release-shared" - }, - { - "name": "nix-gnu-release-static-size", - "displayName": "*nix/GNU/Release/Static/Size", - "inherits": [ "nix-target-list" ], - "configurePreset": "nix-gnu-release-static-size" - }, - { - "name": "nix-gnu-release-shared-size", - "displayName": "*nix/GNU/Release/Shared/Size", - "inherits": [ "nix-target-list" ], - "configurePreset": "nix-gnu-release-shared-size" } ] } diff --git a/builds/vscode/node.code-workspace b/builds/vscode/node.code-workspace index 9a53525cf..818f3c0ab 100644 --- a/builds/vscode/node.code-workspace +++ b/builds/vscode/node.code-workspace @@ -1,4 +1,5 @@ { +<<<<<<< HEAD "folders": [ { "path": "../../../libbitcoin-system" @@ -14,4 +15,12 @@ } ], "settings": {} +======= + "folders": [ + { + "path": "../../../libbitcoin-node" + } + ], + "settings": {} +>>>>>>> e3e1a43d (Regenerate artifacts.) } diff --git a/install-cmakepresets.sh b/install-cmakepresets.sh index 265d74e08..67e59c484 100755 --- a/install-cmakepresets.sh +++ b/install-cmakepresets.sh @@ -354,13 +354,10 @@ handle_custom_options() ($PRESET_ID != "gnu-release") && ($PRESET_ID != "static") && ($PRESET_ID != "shared") && - ($PRESET_ID != "gnu-optimized-size") && ($PRESET_ID != "nix-gnu-debug-static") && ($PRESET_ID != "nix-gnu-debug-shared") && ($PRESET_ID != "nix-gnu-release-static") && - ($PRESET_ID != "nix-gnu-release-shared") && - ($PRESET_ID != "nix-gnu-release-static-size") && - ($PRESET_ID != "nix-gnu-release-shared-size")]]; then + ($PRESET_ID != "nix-gnu-release-shared")]]; then display_error "Unsupported preset: $PRESET_ID" display_error "Supported values are:" display_error " nix-base" @@ -368,13 +365,10 @@ handle_custom_options() display_error " gnu-release" display_error " static" display_error " shared" - display_error " gnu-optimized-size" display_error " nix-gnu-debug-static" display_error " nix-gnu-debug-shared" display_error " nix-gnu-release-static" display_error " nix-gnu-release-shared" - display_error " nix-gnu-release-static-size" - display_error " nix-gnu-release-shared-size" display_error "" display_help exit 1 @@ -387,11 +381,7 @@ handle_custom_options() display_message "REPO_PRESET[libbitcoin-database]=${REPO_PRESET[libbitcoin-database]}" REPO_PRESET[libbitcoin-network]="$BASE_PRESET_ID" display_message "REPO_PRESET[libbitcoin-network]=${REPO_PRESET[libbitcoin-network]}" - if [[ $WITH_ICU ]]; then - REPO_PRESET[libbitcoin-system]="$BASE_PRESET_ID-with_icu" - else - REPO_PRESET[libbitcoin-system]="$BASE_PRESET_ID-without_icu" - fi + REPO_PRESET[libbitcoin-system]="$BASE_PRESET_ID" display_message "REPO_PRESET[libbitcoin-system]=${REPO_PRESET[libbitcoin-system]}" CUMULATIVE_FILTERED_ARGS=""