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.

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

Jump to bottom

Regenerate artifacts. #518

Merged
merged 1 commit into from
Oct 31, 2024
Merged

Regenerate artifacts. #518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"cmake.sourceDirectory": "${workspaceFolder}/builds/cmake",
"cmake.useCMakePresets": "always"
}
45 changes: 0 additions & 45 deletions builds/cmake/CMakePresets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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": [
Expand Down Expand Up @@ -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"
}
]
}
8 changes: 8 additions & 0 deletions builds/vscode/database.code-workspace
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"folders": [
{
"path": "../../../libbitcoin-database"
}
],
"settings": {}
}
14 changes: 2 additions & 12 deletions install-cmakepresets.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -383,11 +377,7 @@ handle_custom_options()
BASE_PRESET_ID="$PRESET_ID"
REPO_PRESET[libbitcoin-database]="$PRESET_ID"
display_message "REPO_PRESET[libbitcoin-database]=${REPO_PRESET[libbitcoin-database]}"
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=""
Expand Down
Loading