Merge pull request #692 from pmienk/master

Regenerate artifacts.
libbitcoin · Oct 31, 2024 · 9fb5c26 · 9fb5c26
2 parents b130b61 + 99294c5
commit 9fb5c26
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 60 deletions.
diff --git 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
@@ -1,4 +1,10 @@
 {
+<<<<<<< HEAD
     "cmake.sourceDirectory": "/home/nixmini/Repository/Source/libbitcoin-node/builds/cmake",
     "cmake.useCMakePresets": "always"
-}
+}
+=======
+    "cmake.sourceDirectory": "${workspaceFolder}/builds/cmake",
+    "cmake.useCMakePresets": "always"
+}
+>>>>>>> e3e1a43d (Regenerate artifacts.)
diff --git 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
@@ -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
@@ -354,27 +354,21 @@ 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"
         display_error "  gnu-debug"
         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=""