-
Notifications
You must be signed in to change notification settings - Fork 17
fix: resolve static linking failures with OpenSSL and duplicate symbols #438
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
Open
dkropachev
wants to merge
5
commits into
master
Choose a base branch
from
fix/164-static-linking-openssl
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
c1eeee8
static linking: support installed consumers and package checks
dkropachev 61d6d5f
testing: remove duplicate static-integration stubs
dkropachev 1dd2538
windows: assemble OPENSSL_LIBS from discovered libraries
dkropachev 3adbdca
ci: split static package smoke checks into dedicated targets
dkropachev 621b995
gitignore: ignore build_static
dkropachev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -44,9 +44,21 @@ jobs: | |
| steps: | ||
| - uses: actions/checkout@v4 | ||
|
|
||
| - uses: actions-rust-lang/setup-rust-toolchain@v1 | ||
|
|
||
| - name: Build and test DEB packages | ||
| run: make test-package-deb | ||
|
|
||
| - name: Verify static package smoke test | ||
| run: make test-package-deb-static-smoke | ||
|
|
||
| - name: Verify static linking builds (regression test for issue #164) | ||
| run: | | ||
| sudo apt-get update -y | ||
| make install-build-dependencies | ||
| make build-static-integration-test-bin | ||
| rm -rf build_static | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ⛏️ We have |
||
|
|
||
| - name: Collect artifacts | ||
| if: inputs.save-artifacts | ||
| run: make collect-package-artifacts | ||
|
|
@@ -75,7 +87,7 @@ jobs: | |
| --health-retries 60 | ||
| steps: | ||
| - name: Install dependencies | ||
| run: dnf -y install git make cmake gcc-c++ findutils rpm-build ninja-build pkgconf-pkg-config openssl-devel clang | ||
| run: dnf -y install git make cmake gcc-c++ findutils rpm-build ninja-build pkgconf-pkg-config openssl-devel zlib-devel clang | ||
|
|
||
| - uses: actions/checkout@v4 | ||
|
|
||
|
|
@@ -84,6 +96,9 @@ jobs: | |
| - name: Build and test RPM packages | ||
| run: make test-package-rpm-native SCYLLA_HOST=scylla SKIP_DOCKER_COMPOSE=1 | ||
|
|
||
| - name: Verify static package smoke test | ||
| run: make test-package-rpm-native-static-smoke SCYLLA_HOST=scylla SKIP_DOCKER_COMPOSE=1 | ||
|
|
||
| - name: Collect artifacts | ||
| if: inputs.save-artifacts | ||
| run: make collect-package-artifacts | ||
|
|
@@ -109,6 +124,14 @@ jobs: | |
| - name: Build and test macOS packages (PKG + DMG) | ||
| run: gmake test-package-macos | ||
|
|
||
| - name: Verify static package smoke test | ||
| run: gmake test-package-macos-static-smoke | ||
|
|
||
| - name: Verify static linking builds (regression test for issue #164) | ||
| run: | | ||
| gmake build-static-integration-test-bin | ||
| rm -rf build_static | ||
|
|
||
| - name: Collect artifacts | ||
| if: inputs.save-artifacts | ||
| run: gmake collect-package-artifacts | ||
|
|
@@ -126,9 +149,20 @@ jobs: | |
| steps: | ||
| - uses: actions/checkout@v4 | ||
|
|
||
| - uses: actions-rust-lang/setup-rust-toolchain@v1 | ||
|
|
||
| - name: Build and test Windows packages (MSI) | ||
| run: make test-package-windows | ||
|
|
||
| - name: Verify static package smoke test | ||
| run: make test-package-windows-static-smoke | ||
|
|
||
| - name: Verify static linking builds (regression test for issue #164) | ||
| run: | | ||
| make build-static-integration-test-bin | ||
| if (Test-Path build_static) { Remove-Item -Recurse -Force build_static } | ||
| shell: pwsh | ||
|
|
||
| - name: Collect artifacts | ||
| if: inputs.save-artifacts | ||
| run: make collect-package-artifacts | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| .vscode/ | ||
| .zed | ||
| build/ | ||
| build_static/ | ||
| build-macos/ | ||
| **/build/ | ||
| **/build-macos/ | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
♻️ commit
static linking: support installed consumers and package checks:The commit message is still unreadable.
Lines should be at most 72 characters long, as per well-established conventions.
Your text contains escaped
\ninstead of newlines.